* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-08-23 7:20 Jeroen Roovers
0 siblings, 0 replies; 249+ messages in thread
From: Jeroen Roovers @ 2015-08-23 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 593b15906d69ae772f7c74a7ba06686edadd7892
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 07:20:05 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 07:20:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593b1590
mail-client/mutt: Stable for HPPA (bug #556042).
Package-Manager: portage-2.2.20.1
mail-client/mutt/mutt-1.5.23-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index bba3952..516cd4f 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-08-24 17:25 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2015-08-24 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 2fe4b60de64dfc09215ac377cb220dd575061a84
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 17:23:56 2015 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 17:25:00 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe4b60d
mail-client/mutt: fix urls to ge.org
Package-Manager: portage-2.2.20-prefix
mail-client/mutt/mutt-1.5.23-r5.ebuild | 4 ++--
mail-client/mutt/mutt-1.5.23-r6.ebuild | 4 ++--
mail-client/mutt/mutt-1.5.23-r7.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r5.ebuild b/mail-client/mutt/mutt-1.5.23-r5.ebuild
index f993ae5..cff736b 100644
--- a/mail-client/mutt/mutt-1.5.23-r5.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r5.ebuild
@@ -71,8 +71,8 @@ src_prepare() {
# If you ever take over or need to modify patches here, just check
# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
# the patchqueue as it'll save you a lot of work.
- # http://prefix.gentooexperimental.org:8000/mutt/
- # http://prefix.gentooexperimental.org:8000/mutt-patches/
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
for rev in $(eval echo {0..${PR#r}}) ; do
local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
[[ -e ${revpatch} ]] && \
diff --git a/mail-client/mutt/mutt-1.5.23-r6.ebuild b/mail-client/mutt/mutt-1.5.23-r6.ebuild
index b7b9e84..5f9cc31 100644
--- a/mail-client/mutt/mutt-1.5.23-r6.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r6.ebuild
@@ -71,8 +71,8 @@ src_prepare() {
# If you ever take over or need to modify patches here, just check
# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
# the patchqueue as it'll save you a lot of work.
- # http://prefix.gentooexperimental.org:8000/mutt/
- # http://prefix.gentooexperimental.org:8000/mutt-patches/
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
for rev in $(eval echo {0..${PR#r}}) ; do
local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
[[ -e ${revpatch} ]] && \
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index bc6d15e..f4016d4 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -71,8 +71,8 @@ src_prepare() {
# If you ever take over or need to modify patches here, just check
# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
# the patchqueue as it'll save you a lot of work.
- # http://prefix.gentooexperimental.org:8000/mutt/
- # http://prefix.gentooexperimental.org:8000/mutt-patches/
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
for rev in $(eval echo {0..${PR#r}}) ; do
local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
[[ -e ${revpatch} ]] && \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-08-25 18:32 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2015-08-25 18:32 UTC (permalink / raw
To: gentoo-commits
commit: c92a8dd572e744aae14123493f309b37cd085a8a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 18:29:32 2015 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 18:32:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92a8dd5
mail-client/mutt: revbump with fix for missing first character in sidebar, bug #541730
Package-Manager: portage-2.2.20-prefix
mail-client/mutt/Manifest | 2 +-
.../mutt/{mutt-1.5.23-r6.ebuild => mutt-1.5.23-r8.ebuild} | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d564e4e..100ba59 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,4 @@
DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d24728df388c5c90eed3276783db061b92212786f3 SHA512 8f89abcca7048a24f5e37190b479f724eb51eb6a1703bc419c9f200f4ad1cb544fa7283ea6d76519f002aed26c9c2f54bd14e89b845001755a0b98e3317b39f8 WHIRLPOOL 04843ec6df35a34b2f601caaff60c6cd2fe16ab66946c6ab0a3be0ff4570743fdc365f7fb28c00c16b6d88e299d0b1b8fac86e8936474e170d1f0d2331209e2c
-DIST mutt-1.5.23-gentoo-patches-r6.tar.bz2 146133 SHA256 8d86fd8ce3be2febf9e13963d5a33088cea34d42e7d5f0eca7fd1bed5cfb12cc SHA512 f6901c1afe651b96a7159a4151738bc2492e9edc4f5f462586278cb2e999affb18e469f81490f3d14b4841bbe8faab32458568795c25784f9d59b30f57278863 WHIRLPOOL 3f9e07ec9eaf029a636e0fb4e1f0723ff4cc202195574748a14ae2950fde6af94f428f017129bcd550caae87dc28933dd0d93bcb7d2066f36255c93da4a5b4f9
DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
+DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
diff --git a/mail-client/mutt/mutt-1.5.23-r6.ebuild b/mail-client/mutt/mutt-1.5.23-r8.ebuild
similarity index 96%
rename from mail-client/mutt/mutt-1.5.23-r6.ebuild
rename to mail-client/mutt/mutt-1.5.23-r8.ebuild
index 5f9cc31..9123d14 100644
--- a/mail-client/mutt/mutt-1.5.23-r6.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r8.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r6"
+PATCHSET_REV="-r8"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
@@ -242,9 +242,11 @@ src_install() {
}
pkg_postinst() {
- 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
+ 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
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-09-02 19:44 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2015-09-02 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 0c67f886a6b24bdb15582082ec29721ee92bf9f3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 19:42:32 2015 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 19:43:31 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c67f886
mail-client/mutt: version bump to 1.5.24
Package-Manager: portage-2.2.20-prefix
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.5.24.ebuild | 252 ++++++++++++++++++++++++++++++++++++
2 files changed, 254 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 100ba59..85c4eec 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,3 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d
DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
+DIST mutt-1.5.24-gentoo-patches.tar.bz2 78689 SHA256 8ee2997448a0d1b9039b7dd61bbda0781ad408a3a98ba6febd06ab90b1a86f4d SHA512 43fcc2a3565d97b073285a57f0a684d73706b95306a18d0e348b6230859acdbab83d2917cc6c1d0baba14efb046a5b79f4fdf47388144f769b4685380ca2922e WHIRLPOOL ea247724afa12e7a5ba8a55c773b6195153e0097cb244b62a7c5b287c877a6bc1670750ae6e99d8bef8a794bfcede0048e27d880717853815529c1674b08ebca
+DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
diff --git a/mail-client/mutt/mutt-1.5.24.ebuild b/mail-client/mutt/mutt-1.5.24.ebuild
new file mode 100644
index 0000000..c2c1ed3
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.24.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV=""
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+ https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? ( >=dev-libs/openssl-0.9.6 )
+ slang? ( sys-libs/slang )
+ !slang? ( >=sys-libs/ncurses-5.2 )
+"
+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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+ # Post-release hot-fixes grabbed from HG, this is what all following
+ # patches are based on in my Mercurial patchqueue (mq).
+ # If you ever take over or need to modify patches here, just check
+ # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+ # the patchqueue as it'll save you a lot of work.
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
+ # fix compilation with ncurses[tinfo], #459260
+ epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+ # this patch is non-generic and only works because we use a sysconfdir
+ # different from the one used by the mailbase ebuild
+ use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+ # must have fixes to compile or behave correctly, upstream
+ # ignores, disagrees or simply doesn't respond/apply
+ epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+ # same category, but functional bits
+ epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+ # the big feature patches that upstream doesn't want to include, but
+ # nearly every distro has due to their usefulness
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+ epatch "${p}"
+ done
+
+ # we conditionalise this one, simply because it has considerable
+ # impact on the code
+ if use sidebar ; then
+ epatch "${PATCHDIR}"/sidebar-20140412.patch
+ epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+ epatch "${PATCHDIR}"/sidebar-counts.patch
+ fi
+
+ local upatches=
+ # allow user patches
+ epatch_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang) \
+ --enable-compressed \
+ --enable-external-dotlock \
+ --enable-nfs-fix \
+ --sysconfdir=${EPREFIX}/etc/${PN} \
+ --with-curses \
+ --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+ --with-regex \
+ --with-exec-shell=${EPREFIX}/bin/sh"
+
+ case $CHOST in
+ *-solaris*)
+ # Solaris has no flock in the standard headers
+ myconf="${myconf} --enable-fcntl --disable-flock"
+ ;;
+ *)
+ myconf="${myconf} --disable-fcntl --enable-flock"
+ ;;
+ esac
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-09-05 8:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2015-09-05 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 126e552160ba0ccecc8e98c5759f548d43a87ca3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 08:13:25 2015 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 08:15:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126e5521
mail-client/mutt: fix curses/slang usage and wc-funcs on Solaris for arrows
Package-Manager: portage-2.2.20-prefix
mail-client/mutt/mutt-1.5.24.ebuild | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.24.ebuild b/mail-client/mutt/mutt-1.5.24.ebuild
index c2c1ed3..a2a2538 100644
--- a/mail-client/mutt/mutt-1.5.24.ebuild
+++ b/mail-client/mutt/mutt-1.5.24.ebuild
@@ -140,12 +140,12 @@ src_configure() {
$(use_enable smtp) \
$(use_with idn) \
$(use_with kerberos gss) \
- $(use slang && echo --with-slang) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-curses=${EPREFIX}/usr) \
--enable-compressed \
--enable-external-dotlock \
--enable-nfs-fix \
--sysconfdir=${EPREFIX}/etc/${PN} \
- --with-curses \
--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
--with-regex \
--with-exec-shell=${EPREFIX}/bin/sh"
@@ -153,10 +153,12 @@ src_configure() {
case $CHOST in
*-solaris*)
# Solaris has no flock in the standard headers
- myconf="${myconf} --enable-fcntl --disable-flock"
+ myconf+=" --enable-fcntl --disable-flock"
+ # wchar_t depends on locale
+ myconf+=" --without-wc-funcs"
;;
*)
- myconf="${myconf} --disable-fcntl --enable-flock"
+ myconf+=" --disable-fcntl --enable-flock"
;;
esac
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-09-06 15:50 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2015-09-06 15:50 UTC (permalink / raw
To: gentoo-commits
commit: ab1d9bb9fee398b0cc01b8a38acb84cdb6f9b506
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 15:48:44 2015 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 15:50:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab1d9bb9
mail-client/mutt: revbump to 1.5.24-r1 for upstream fixes and fix for bug #559514
Package-Manager: portage-2.2.20-prefix
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.5.24.ebuild => mutt-1.5.24-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 85c4eec..7c79378 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,5 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d
DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
-DIST mutt-1.5.24-gentoo-patches.tar.bz2 78689 SHA256 8ee2997448a0d1b9039b7dd61bbda0781ad408a3a98ba6febd06ab90b1a86f4d SHA512 43fcc2a3565d97b073285a57f0a684d73706b95306a18d0e348b6230859acdbab83d2917cc6c1d0baba14efb046a5b79f4fdf47388144f769b4685380ca2922e WHIRLPOOL ea247724afa12e7a5ba8a55c773b6195153e0097cb244b62a7c5b287c877a6bc1670750ae6e99d8bef8a794bfcede0048e27d880717853815529c1674b08ebca
+DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
diff --git a/mail-client/mutt/mutt-1.5.24.ebuild b/mail-client/mutt/mutt-1.5.24-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.5.24.ebuild
rename to mail-client/mutt/mutt-1.5.24-r1.ebuild
index a2a2538..a7b9a1c 100644
--- a/mail-client/mutt/mutt-1.5.24.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
inherit eutils flag-o-matic autotools
-PATCHSET_REV=""
+PATCHSET_REV="-r1"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-10-04 21:28 Julian Ospald
0 siblings, 0 replies; 249+ messages in thread
From: Julian Ospald @ 2015-10-04 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 03de7a1651bea4336c3bc5246f1a4f5b216e9d67
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 21:27:53 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 21:27:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03de7a16
mail-client/mutt: add libressl support
mail-client/mutt/mutt-1.5.24-r2.ebuild | 272 +++++++++++++++++++++++++++++++++
1 file changed, 272 insertions(+)
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
new file mode 100644
index 0000000..306d9b5
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r1"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+ https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+ # Post-release hot-fixes grabbed from HG, this is what all following
+ # patches are based on in my Mercurial patchqueue (mq).
+ # If you ever take over or need to modify patches here, just check
+ # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+ # the patchqueue as it'll save you a lot of work.
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
+ # fix compilation with ncurses[tinfo], #459260
+ epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+ # this patch is non-generic and only works because we use a sysconfdir
+ # different from the one used by the mailbase ebuild
+ use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+ # must have fixes to compile or behave correctly, upstream
+ # ignores, disagrees or simply doesn't respond/apply
+ epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+ # same category, but functional bits
+ epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+ # the big feature patches that upstream doesn't want to include, but
+ # nearly every distro has due to their usefulness
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+ epatch "${p}"
+ done
+
+ # we conditionalise this one, simply because it has considerable
+ # impact on the code
+ if use sidebar ; then
+ epatch "${PATCHDIR}"/sidebar-20140412.patch
+ epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+ epatch "${PATCHDIR}"/sidebar-counts.patch
+ fi
+
+ local upatches=
+ # allow user patches
+ epatch_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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"
+
+ case $CHOST in
+ *-solaris*)
+ # Solaris has no flock in the standard headers
+ myconf+=" --enable-fcntl --disable-flock"
+ # wchar_t depends on locale
+ myconf+=" --without-wc-funcs"
+ ;;
+ *)
+ myconf+=" --disable-fcntl --enable-flock"
+ ;;
+ esac
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2015-12-03 22:40 Michał Górny
0 siblings, 0 replies; 249+ messages in thread
From: Michał Górny @ 2015-12-03 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 0ed0b6c7697c1d7a8ef2099abf1088af9ec40023
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 3 22:37:35 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 22:40:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed0b6c7
mail-client/mutt: Replace mirror://bitbucket with inline URL
Replace mirror://bitbucket that has been removed in July 2014 with
correct inline URL.
mail-client/mutt/mutt-1.5.23-r5.ebuild | 2 +-
mail-client/mutt/mutt-1.5.23-r7.ebuild | 2 +-
mail-client/mutt/mutt-1.5.23-r8.ebuild | 2 +-
mail-client/mutt/mutt-1.5.24-r1.ebuild | 2 +-
mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r5.ebuild b/mail-client/mutt/mutt-1.5.23-r5.ebuild
index cff736b..877cd5b 100644
--- a/mail-client/mutt/mutt-1.5.23-r5.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r5.ebuild
@@ -11,7 +11,7 @@ PATCHSET_REV="-r5"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index 4b32227..da0cf15 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -11,7 +11,7 @@ PATCHSET_REV="-r7"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
diff --git a/mail-client/mutt/mutt-1.5.23-r8.ebuild b/mail-client/mutt/mutt-1.5.23-r8.ebuild
index 9123d14..49771a2 100644
--- a/mail-client/mutt/mutt-1.5.23-r8.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r8.ebuild
@@ -11,7 +11,7 @@ PATCHSET_REV="-r8"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
diff --git a/mail-client/mutt/mutt-1.5.24-r1.ebuild b/mail-client/mutt/mutt-1.5.24-r1.ebuild
index a7b9a1c..3860e13 100644
--- a/mail-client/mutt/mutt-1.5.24-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r1.ebuild
@@ -11,7 +11,7 @@ PATCHSET_REV="-r1"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index 306d9b5..e722791 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -11,7 +11,7 @@ PATCHSET_REV="-r1"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-01-20 14:12 Patrice Clement
0 siblings, 0 replies; 249+ messages in thread
From: Patrice Clement @ 2016-01-20 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 439cdcc2427233a4ba4a455d31ae102347b4a12e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 14:09:31 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 14:09:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439cdcc2
mail-client/mutt: Stable for ppc+amd64+x86. Fixes bug 572342.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index e722791..15eca4a 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-01-24 6:50 Jeroen Roovers
0 siblings, 0 replies; 249+ messages in thread
From: Jeroen Roovers @ 2016-01-24 6:50 UTC (permalink / raw
To: gentoo-commits
commit: 3625da6660706f3602b605c7788592930a6d3aa6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 06:50:11 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 06:50:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3625da66
mail-client/mutt: Stable for HPPA (bug #572342).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index 15eca4a..153dc59 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-02-03 14:47 Tobias Klausmann
0 siblings, 0 replies; 249+ messages in thread
From: Tobias Klausmann @ 2016-02-03 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 596ec7e49d2da11fd4d83e2b3d4ec3a2e97d6003
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 14:46:48 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 14:46:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596ec7e4
mail-client/mutt: add alpha keyword
Gentoo-Bug: 572342
Package-Manager: portage-2.2.27
mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index 153dc59..e8e93a1 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-04-04 14:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-04-04 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 6de4ac814907c7712948992b858a5a9437ef06dc
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 14:10:44 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 14:15:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de4ac81
mail-client/mutt: version bump to 1.6.0, USE=sidebar doesn't compile yet
Package-Manager: portage-2.2.28-prefix
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.6.0.ebuild | 287 +++++++++++++++++++++++++++++++++++++
2 files changed, 289 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 7c79378..298226a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,3 +4,5 @@ DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
+DIST mutt-1.6.0-gentoo-patches-r2.tar.xz 71108 SHA256 70709080f34b0eb49b5279f477f8f81b9b552e7eadc8e3bade761cbf905aac18 SHA512 8fff6af8e2d92612d9c90d89e526e85e11271ba42ae8b4482f813fe4ad4708746e1a5d602ab75e59ebc90e92b5d3f97a81d69a76d0f75173970f5b338bd1fd67 WHIRLPOOL 590361266bab02f95f1e78784ce8e0617c9766dccd2823864b24e4c6bc12f069ffbcdde741dc162f024431db68b0047cf7b97c3ef756be6f73499bc6a961e796
+DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
diff --git a/mail-client/mutt/mutt-1.6.0.ebuild b/mail-client/mutt/mutt-1.6.0.ebuild
new file mode 100644
index 0000000..ec55f28
--- /dev/null
+++ b/mail-client/mutt/mutt-1.6.0.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r2"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+ ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.xz
+ https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.xz"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+pkg_setup() {
+ if use sidebar ; then
+ eerror "Sorry, but this version does not yet support sidebar"
+ eerror "Please mask ${PF} for now and check back later:"
+ eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+ die "booooo"
+ fi
+}
+
+src_prepare() {
+ # Post-release hot-fixes grabbed from HG, this is what all following
+ # patches are based on in my Mercurial patchqueue (mq).
+ # If you ever take over or need to modify patches here, just check
+ # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+ # the patchqueue as it'll save you a lot of work.
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
+ # fix compilation with ncurses[tinfo], #459260
+ epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+ # this patch is non-generic and only works because we use a sysconfdir
+ # different from the one used by the mailbase ebuild
+ use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+ # must have fixes to compile or behave correctly, upstream
+ # ignores, disagrees or simply doesn't respond/apply
+ epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+ # same category, but functional bits
+ epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+ # the big feature patches that upstream doesn't want to include, but
+ # nearly every distro has due to their usefulness
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+ epatch "${p}"
+ done
+
+ # we conditionalise this one, simply because it has considerable
+ # impact on the code
+ if use sidebar ; then
+ epatch "${PATCHDIR}"/sidebar-20140412.patch
+ epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+ epatch "${PATCHDIR}"/sidebar-counts.patch
+ fi
+
+ # Avoid symbol conflicts on Solaris
+ sed -i \
+ -e 's/\<M_CMD\>/MUTT_CMD/g' \
+ -e 's/\<M_READ\>/MUTT_READ/g' \
+ *.[ch] imap/*.[ch] || die
+
+ local upatches=
+ # allow user patches
+ eapply_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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"
+
+ case $CHOST in
+ *-solaris*)
+ # Solaris has no flock in the standard headers
+ myconf+=" --enable-fcntl --disable-flock"
+ # wchar_t depends on locale
+ myconf+=" --without-wc-funcs"
+ ;;
+ *)
+ myconf+=" --disable-fcntl --enable-flock"
+ ;;
+ esac
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-04-05 15:52 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-04-05 15:52 UTC (permalink / raw
To: gentoo-commits
commit: a7fb0fb0ea2f1a80e2f54b969a57f542146c7531
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 5 15:49:30 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 15:51:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fb0fb0
mail-client/mutt: imported neomutt patch for sidebar with 1.6.0
Package-Manager: portage-2.2.28-prefix
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.6.0.ebuild | 19 ++++---------------
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 298226a..c14cb0f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,5 +4,5 @@ DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.0-gentoo-patches-r2.tar.xz 71108 SHA256 70709080f34b0eb49b5279f477f8f81b9b552e7eadc8e3bade761cbf905aac18 SHA512 8fff6af8e2d92612d9c90d89e526e85e11271ba42ae8b4482f813fe4ad4708746e1a5d602ab75e59ebc90e92b5d3f97a81d69a76d0f75173970f5b338bd1fd67 WHIRLPOOL 590361266bab02f95f1e78784ce8e0617c9766dccd2823864b24e4c6bc12f069ffbcdde741dc162f024431db68b0047cf7b97c3ef756be6f73499bc6a961e796
+DIST mutt-1.6.0-gentoo-patches-r3.tar.xz 98916 SHA256 f2da720b9498764ea42a6c5e2143aa1691ef84982fe02ddf405a1071e834dc95 SHA512 52af447376aac9c24735e4bc1c9c489b44cbb0d94b04b8792d92c3d8286bb4de604ccab5ca2cf4d93240266098e7c307adf60506538ccf47535e23babb3c62db WHIRLPOOL 3210d10f16e1d6b22e809a45456d13c07778b3240c66d3b082ef11d1b3518e733418e3bfe659f02893330a85448bcc3a99b01ef91b4e1f7027831c322da6cca2
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
diff --git a/mail-client/mutt/mutt-1.6.0.ebuild b/mail-client/mutt/mutt-1.6.0.ebuild
index ec55f28..985545d 100644
--- a/mail-client/mutt/mutt-1.6.0.ebuild
+++ b/mail-client/mutt/mutt-1.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r2"
+PATCHSET_REV="-r3"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
@@ -83,15 +83,6 @@ RDEPEND="${CDEPEND}
"
PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-pkg_setup() {
- if use sidebar ; then
- eerror "Sorry, but this version does not yet support sidebar"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "booooo"
- fi
-}
-
src_prepare() {
# Post-release hot-fixes grabbed from HG, this is what all following
# patches are based on in my Mercurial patchqueue (mq).
@@ -127,15 +118,13 @@ src_prepare() {
# we conditionalise this one, simply because it has considerable
# impact on the code
if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-20140412.patch
- epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
- epatch "${PATCHDIR}"/sidebar-counts.patch
+ epatch "${PATCHDIR}"/sidebar-neomutt.patch
fi
# Avoid symbol conflicts on Solaris
sed -i \
- -e 's/\<M_CMD\>/MUTT_CMD/g' \
- -e 's/\<M_READ\>/MUTT_READ/g' \
+ -e 's/\<M_CMD\>/MT_CMD/g' \
+ -e 's/\<M_READ\>/MT_READ/g' \
*.[ch] imap/*.[ch] || die
local upatches=
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-04-12 18:57 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-04-12 18:57 UTC (permalink / raw
To: gentoo-commits
commit: d2a278ff26554395655c1e0027f256434770d272
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 18:57:10 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 18:57:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a278ff
mail-client/mutt: add elog about changed option names for sidebar
Package-Manager: portage-2.2.28-prefix
mail-client/mutt/mutt-1.6.0-r1.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/mail-client/mutt/mutt-1.6.0-r1.ebuild b/mail-client/mutt/mutt-1.6.0-r1.ebuild
index eaba6bd..d4947fc 100644
--- a/mail-client/mutt/mutt-1.6.0-r1.ebuild
+++ b/mail-client/mutt/mutt-1.6.0-r1.ebuild
@@ -267,5 +267,11 @@ pkg_postinst() {
elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
elog " https://wiki.gentoo.org/wiki/Mutt"
echo
+ elif use sidebar ; then
+ echo
+ elog "The sidebar patch has changed config names, please see"
+ elog "the following page for a list of new names:"
+ elog "http://www.neomutt.org/sidebar-intro.html#intro-sidebar-config-changes"
+ echo
fi
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-04-12 18:57 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-04-12 18:57 UTC (permalink / raw
To: gentoo-commits
commit: c58b75b1f8fe10d7b347ddd8573a0b8cc3b89fa1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 18:53:49 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 18:57:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c58b75b1
mail-client/mutt: revbump: misc fixes including security, activation of sidebar path, bug #579298
Package-Manager: portage-2.2.28-prefix
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.6.0.ebuild => mutt-1.6.0-r1.ebuild} | 9 ++-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c14cb0f..d842099 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,5 +4,5 @@ DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.0-gentoo-patches-r3.tar.xz 98916 SHA256 f2da720b9498764ea42a6c5e2143aa1691ef84982fe02ddf405a1071e834dc95 SHA512 52af447376aac9c24735e4bc1c9c489b44cbb0d94b04b8792d92c3d8286bb4de604ccab5ca2cf4d93240266098e7c307adf60506538ccf47535e23babb3c62db WHIRLPOOL 3210d10f16e1d6b22e809a45456d13c07778b3240c66d3b082ef11d1b3518e733418e3bfe659f02893330a85448bcc3a99b01ef91b4e1f7027831c322da6cca2
+DIST mutt-1.6.0-gentoo-patches-r4.tar.xz 101772 SHA256 a992ba0e571e00b35bb34e12e833393eb507d9aa359e03fa82497214a4a3ee1d SHA512 a9ff509ce2c62a1331de546c9249795c179042bd8ebff1702801f5a157cbc6c0c16f6a3c9cb231955efe15486cf7fc52876b7142eb72a7a1ab5a98889bca205f WHIRLPOOL 16e75667fd1fce35888509ac2dd25f7d5db311ac7e6f7b1cedf373eff599cc535f65b6363d56013e230173b4a78e91e9a14c724da8c4cc5c75fd98577d79ac1b
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
diff --git a/mail-client/mutt/mutt-1.6.0.ebuild b/mail-client/mutt/mutt-1.6.0-r1.ebuild
similarity index 97%
rename from mail-client/mutt/mutt-1.6.0.ebuild
rename to mail-client/mutt/mutt-1.6.0-r1.ebuild
index 985545d..eaba6bd 100644
--- a/mail-client/mutt/mutt-1.6.0.ebuild
+++ b/mail-client/mutt/mutt-1.6.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r3"
+PATCHSET_REV="-r4"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
@@ -115,12 +115,6 @@ src_prepare() {
epatch "${p}"
done
- # we conditionalise this one, simply because it has considerable
- # impact on the code
- if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-neomutt.patch
- fi
-
# Avoid symbol conflicts on Solaris
sed -i \
-e 's/\<M_CMD\>/MT_CMD/g' \
@@ -158,6 +152,7 @@ src_configure() {
$(use_enable nls) \
$(use_enable nntp) \
$(use_enable pop) \
+ $(use_enable sidebar) \
$(use_enable smime) \
$(use_enable smtp) \
$(use_with idn) \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-04-17 20:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-04-17 20:15 UTC (permalink / raw
To: gentoo-commits
commit: e6c03fd06d0a06c6a83360b1b72b1ccc6623eb1e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 20:14:55 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 20:15:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c03fd0
mail-client/mutt: revbump for new fixes to core and sidebar, bug #579936
Package-Manager: portage-2.2.28-prefix
mail-client/mutt/Manifest | 1 +
mail-client/mutt/mutt-1.6.0-r2.ebuild | 277 ++++++++++++++++++++++++++++++++++
2 files changed, 278 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d842099..2fe504b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,4 +5,5 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.6.0-gentoo-patches-r4.tar.xz 101772 SHA256 a992ba0e571e00b35bb34e12e833393eb507d9aa359e03fa82497214a4a3ee1d SHA512 a9ff509ce2c62a1331de546c9249795c179042bd8ebff1702801f5a157cbc6c0c16f6a3c9cb231955efe15486cf7fc52876b7142eb72a7a1ab5a98889bca205f WHIRLPOOL 16e75667fd1fce35888509ac2dd25f7d5db311ac7e6f7b1cedf373eff599cc535f65b6363d56013e230173b4a78e91e9a14c724da8c4cc5c75fd98577d79ac1b
+DIST mutt-1.6.0-gentoo-patches-r5.tar.xz 102752 SHA256 9b521d0054e6301ebfc161d8a23196b9766d88838b892213392a0c8f8da9f538 SHA512 8a7bd149270d03fc114a8364325358b871ca914e234a24bd3c1235674173ad099608df6d194d7e91d6aef5c5db2d3d2e545ae8589736c9b232901fb4bf3759ed WHIRLPOOL 98423ebcfd81fb2bf2af4d95b4043e5b7a12f2d3d7e4f9720c40ac45d67ee649fb148032e8acd387f681e24d6be3abf92db451e5df9a67c6d6a329f6ca7ff880
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
diff --git a/mail-client/mutt/mutt-1.6.0-r2.ebuild b/mail-client/mutt/mutt-1.6.0-r2.ebuild
new file mode 100644
index 0000000..5c55593
--- /dev/null
+++ b/mail-client/mutt/mutt-1.6.0-r2.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r5"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+ ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.xz
+ https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.xz"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+ # Post-release hot-fixes grabbed from HG, this is what all following
+ # patches are based on in my Mercurial patchqueue (mq).
+ # If you ever take over or need to modify patches here, just check
+ # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+ # the patchqueue as it'll save you a lot of work.
+ # http://hg.code.sf.net/p/gentoomutt/code/
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/
+ for rev in $(eval echo {0..${PR#r}}) ; do
+ local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+ [[ -e ${revpatch} ]] && \
+ epatch "${revpatch}"
+ done
+ # fix compilation with ncurses[tinfo], #459260
+ epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+ # this patch is non-generic and only works because we use a sysconfdir
+ # different from the one used by the mailbase ebuild
+ use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+ # must have fixes to compile or behave correctly, upstream
+ # ignores, disagrees or simply doesn't respond/apply
+ epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+ # same category, but functional bits
+ epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+ # the big feature patches that upstream doesn't want to include, but
+ # nearly every distro has due to their usefulness
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+ epatch "${p}"
+ done
+
+ # Avoid symbol conflicts on Solaris
+ sed -i \
+ -e 's/\<M_CMD\>/MT_CMD/g' \
+ -e 's/\<M_READ\>/MT_READ/g' \
+ *.[ch] imap/*.[ch] || die
+
+ local upatches=
+ # allow user patches
+ eapply_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable sidebar) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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"
+
+ case $CHOST in
+ *-solaris*)
+ # Solaris has no flock in the standard headers
+ myconf+=" --enable-fcntl --disable-flock"
+ # wchar_t depends on locale
+ myconf+=" --without-wc-funcs"
+ ;;
+ *)
+ myconf+=" --disable-fcntl --enable-flock"
+ ;;
+ esac
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ elif use sidebar ; then
+ echo
+ elog "The sidebar patch has changed config names, please see"
+ elog "the following page for a list of new names:"
+ elog "http://www.neomutt.org/sidebar-intro.html#intro-sidebar-config-changes"
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-04-18 7:23 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-04-18 7:23 UTC (permalink / raw
To: gentoo-commits
commit: 5638d0d6d08b79684ba1638402af81bb1264b485
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 07:23:07 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 07:23:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5638d0d6
mail-client/mutt: bump patchset to fix compilation problem with USE=-sidebar, bug #580376
Package-Manager: portage-2.2.28-prefix
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.6.0-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2fe504b..dc9d60d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,5 +5,5 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.6.0-gentoo-patches-r4.tar.xz 101772 SHA256 a992ba0e571e00b35bb34e12e833393eb507d9aa359e03fa82497214a4a3ee1d SHA512 a9ff509ce2c62a1331de546c9249795c179042bd8ebff1702801f5a157cbc6c0c16f6a3c9cb231955efe15486cf7fc52876b7142eb72a7a1ab5a98889bca205f WHIRLPOOL 16e75667fd1fce35888509ac2dd25f7d5db311ac7e6f7b1cedf373eff599cc535f65b6363d56013e230173b4a78e91e9a14c724da8c4cc5c75fd98577d79ac1b
-DIST mutt-1.6.0-gentoo-patches-r5.tar.xz 102752 SHA256 9b521d0054e6301ebfc161d8a23196b9766d88838b892213392a0c8f8da9f538 SHA512 8a7bd149270d03fc114a8364325358b871ca914e234a24bd3c1235674173ad099608df6d194d7e91d6aef5c5db2d3d2e545ae8589736c9b232901fb4bf3759ed WHIRLPOOL 98423ebcfd81fb2bf2af4d95b4043e5b7a12f2d3d7e4f9720c40ac45d67ee649fb148032e8acd387f681e24d6be3abf92db451e5df9a67c6d6a329f6ca7ff880
+DIST mutt-1.6.0-gentoo-patches-r6.tar.xz 102716 SHA256 7130215f78f69389d9c2520db0ef568c23d9cf508cfec9c058c846b01c53cce6 SHA512 60d47196a3daee1b976bc8a48b0b2f5b73e08106765bfad9cc5a63f9078fea1f86c2ed20365da9f36392b87f1da32a16646c4a20e76ab621038d3b5af388ee5f WHIRLPOOL 445b9d2f33c3a5cbc53cacdf6417945fcd95b8b99e76b77593dd68895f592beed64c44142d7df5467b3f22984d473e150f96e02a7e2d0177621361067457947f
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
diff --git a/mail-client/mutt/mutt-1.6.0-r2.ebuild b/mail-client/mutt/mutt-1.6.0-r2.ebuild
index 5c55593..74da155 100644
--- a/mail-client/mutt/mutt-1.6.0-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r5"
+PATCHSET_REV="-r6"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-05-02 9:30 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-05-02 9:30 UTC (permalink / raw
To: gentoo-commits
commit: ea8a1dae2ba742f2ef3696b15e0f8666fd79f7ee
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 09:30:19 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 2 09:30:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea8a1dae
mail-client/mutt: version bump to 1.6.1
Package-Manager: portage-2.2.26
mail-client/mutt/Manifest | 3 ++-
mail-client/mutt/{mutt-1.6.0-r1.ebuild => mutt-1.6.1.ebuild} | 8 +-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index dc9d60d..cf18878 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,6 +4,7 @@ DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.0-gentoo-patches-r4.tar.xz 101772 SHA256 a992ba0e571e00b35bb34e12e833393eb507d9aa359e03fa82497214a4a3ee1d SHA512 a9ff509ce2c62a1331de546c9249795c179042bd8ebff1702801f5a157cbc6c0c16f6a3c9cb231955efe15486cf7fc52876b7142eb72a7a1ab5a98889bca205f WHIRLPOOL 16e75667fd1fce35888509ac2dd25f7d5db311ac7e6f7b1cedf373eff599cc535f65b6363d56013e230173b4a78e91e9a14c724da8c4cc5c75fd98577d79ac1b
DIST mutt-1.6.0-gentoo-patches-r6.tar.xz 102716 SHA256 7130215f78f69389d9c2520db0ef568c23d9cf508cfec9c058c846b01c53cce6 SHA512 60d47196a3daee1b976bc8a48b0b2f5b73e08106765bfad9cc5a63f9078fea1f86c2ed20365da9f36392b87f1da32a16646c4a20e76ab621038d3b5af388ee5f WHIRLPOOL 445b9d2f33c3a5cbc53cacdf6417945fcd95b8b99e76b77593dd68895f592beed64c44142d7df5467b3f22984d473e150f96e02a7e2d0177621361067457947f
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
+DIST mutt-1.6.1-gentoo-patches-r3.tar.xz 102076 SHA256 0ffe4937a98036740ce1cf07762cf147d47878bded9393f22c3c61e8a5b0141a SHA512 528f2a654cfd5e11dcc98a61fbb36f9b062db93c3194ec6c8f27d232977a6dc728828a4356bc8dc030556227fb0ff7986c747d5706fae44db6c6460a56fba841 WHIRLPOOL 8285172e534a8537dac50a3ec4ecfc9461f323d08c97c73ae26982468789315502f5bf35df8baf3e7f14bdca1e282411ac751d59ca1ff9465a2e978732e9da80
+DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
diff --git a/mail-client/mutt/mutt-1.6.0-r1.ebuild b/mail-client/mutt/mutt-1.6.1.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-1.6.0-r1.ebuild
rename to mail-client/mutt/mutt-1.6.1.ebuild
index d4947fc..baf7a27 100644
--- a/mail-client/mutt/mutt-1.6.0-r1.ebuild
+++ b/mail-client/mutt/mutt-1.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r4"
+PATCHSET_REV="-r3"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
@@ -115,12 +115,6 @@ src_prepare() {
epatch "${p}"
done
- # Avoid symbol conflicts on Solaris
- sed -i \
- -e 's/\<M_CMD\>/MT_CMD/g' \
- -e 's/\<M_READ\>/MT_READ/g' \
- *.[ch] imap/*.[ch] || die
-
local upatches=
# allow user patches
eapply_user && upatches=" with user patches"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-05-15 10:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-05-15 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 0d5965223ce010689babc034a3f119de3ebffe62
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 10:14:57 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun May 15 10:15:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d596522
mail-client/mutt: revbump for latest win-sidebar patch and upstream fixes
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.6.1.ebuild => mutt-1.6.1-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cf18878..6b3be99 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -6,5 +6,5 @@ DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.6.0-gentoo-patches-r6.tar.xz 102716 SHA256 7130215f78f69389d9c2520db0ef568c23d9cf508cfec9c058c846b01c53cce6 SHA512 60d47196a3daee1b976bc8a48b0b2f5b73e08106765bfad9cc5a63f9078fea1f86c2ed20365da9f36392b87f1da32a16646c4a20e76ab621038d3b5af388ee5f WHIRLPOOL 445b9d2f33c3a5cbc53cacdf6417945fcd95b8b99e76b77593dd68895f592beed64c44142d7df5467b3f22984d473e150f96e02a7e2d0177621361067457947f
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
-DIST mutt-1.6.1-gentoo-patches-r3.tar.xz 102076 SHA256 0ffe4937a98036740ce1cf07762cf147d47878bded9393f22c3c61e8a5b0141a SHA512 528f2a654cfd5e11dcc98a61fbb36f9b062db93c3194ec6c8f27d232977a6dc728828a4356bc8dc030556227fb0ff7986c747d5706fae44db6c6460a56fba841 WHIRLPOOL 8285172e534a8537dac50a3ec4ecfc9461f323d08c97c73ae26982468789315502f5bf35df8baf3e7f14bdca1e282411ac751d59ca1ff9465a2e978732e9da80
+DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
diff --git a/mail-client/mutt/mutt-1.6.1.ebuild b/mail-client/mutt/mutt-1.6.1-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.6.1.ebuild
rename to mail-client/mutt/mutt-1.6.1-r1.ebuild
index baf7a27..edd3d08 100644
--- a/mail-client/mutt/mutt-1.6.1.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHSET_REV="-r3"
+PATCHSET_REV="-r5"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-06-11 13:15 Markus Meier
0 siblings, 0 replies; 249+ messages in thread
From: Markus Meier @ 2016-06-11 13:15 UTC (permalink / raw
To: gentoo-commits
commit: e49c1ac80ec1a82c8986a4eb437bdb32c9847077
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 13:15:03 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 13:15:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49c1ac8
mail-client/mutt: arm stable, bug #572342
Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="arm"
mail-client/mutt/mutt-1.5.24-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index e8e93a1..e2ed809 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-06-13 8:21 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-06-13 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 505ab638871e98b54c7d8025ab036f02b428e77e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 08:05:48 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 08:21:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505ab638
mail-client/mutt: add masked 1.6.1-r2 fully based on NeoMutt project patches
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 1 +
mail-client/mutt/mutt-1.6.1-r2.ebuild | 265 ++++++++++++++++++++++++++++++++++
2 files changed, 266 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6b3be99..90a552f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,5 @@ DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7
DIST mutt-1.6.0-gentoo-patches-r6.tar.xz 102716 SHA256 7130215f78f69389d9c2520db0ef568c23d9cf508cfec9c058c846b01c53cce6 SHA512 60d47196a3daee1b976bc8a48b0b2f5b73e08106765bfad9cc5a63f9078fea1f86c2ed20365da9f36392b87f1da32a16646c4a20e76ab621038d3b5af388ee5f WHIRLPOOL 445b9d2f33c3a5cbc53cacdf6417945fcd95b8b99e76b77593dd68895f592beed64c44142d7df5467b3f22984d473e150f96e02a7e2d0177621361067457947f
DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
+DIST mutt-1.6.1-neomutt-patches-3d90396616d009a7dcbfbb17d8a74b3eee70bd9a.zip 538034 SHA256 d76441eb51295afccc060bfee40ef03ab1b865de1187ea1f26349281d11784a6 SHA512 ca5334c9d0a295cba8749d1d7315d6d7a8ac93f48cfd9a1e112f9b5dd61f808966ec320464aab282cc626c08764294844368dca1520bc9dc6029c12004b7bb50 WHIRLPOOL b14ae9b58c6ba81956caefe049a0c6706436700e060402a9d869d9b98b61d74df5478dd07ee9cd520c4e6012a22b01d29857f74a8e3955680948e06f4e04cbec
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
new file mode 100644
index 0000000..56ac7c1
--- /dev/null
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+NEOMUTT="3d90396616d009a7dcbfbb17d8a74b3eee70bd9a" # 20160611
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+ https://github.com/neomutt/integration/archive/${NEOMUTT}.zip -> ${P}-neomutt-patches-${NEOMUTT}.zip"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+# this needs some testing due to full-on neomutt changes
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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}"/integration-${NEOMUTT}
+
+ # apply NeoMutt patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ # order of patches from README.md
+ local patches=(
+ features-common
+ features-extra
+ bugs-neomutt
+ gentoo-pre
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}"
+ EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+ || die "NeoMutt patchset ${patchset} failed"
+ done
+ # add some explanation as to why not going to upstream
+ sed -i \
+ -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
+ version.c || die "Failed to add bug instructions"
+
+ local upatches=
+ # allow user patches
+ eapply_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ rm VERSION.neo || die # we already flag it appropriate
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \
+ 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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable sidebar) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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"
+
+ case $CHOST in
+ *-solaris*)
+ # Solaris has no flock in the standard headers
+ myconf+=" --enable-fcntl --disable-flock"
+ # wchar_t depends on locale
+ myconf+=" --without-wc-funcs"
+ ;;
+ *)
+ myconf+=" --disable-fcntl --enable-flock"
+ ;;
+ esac
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ echo
+ elog "This version of Mutt is entirely based on NeoMutt patches."
+ elog "Please visit http://www.neomutt.org/ to learn more about this project."
+ elog "As a result, 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-06-13 8:25 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-06-13 8:25 UTC (permalink / raw
To: gentoo-commits
commit: a775e4b139ff9f3ca9130f3d2aacd93ff1f072fe
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 08:25:28 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 08:25:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a775e4b1
mail-client/mutt: remove misaligning space from 1.6.1-r2 upgrade instructions
Package-Manager: portage-2.2.28
mail-client/mutt/mutt-1.6.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
index 56ac7c1..897993e 100644
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -259,7 +259,7 @@ pkg_postinst() {
elog "Please visit http://www.neomutt.org/ to learn more about this project."
elog "As a result, 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 ]>"
+ elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>"
echo
fi
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-06-16 12:20 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-06-16 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 7328ec3a99b93a92aa0a741dca9c83d232f9802b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 12:18:24 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 12:18:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7328ec3a
mail-client/mutt: change default locking mechanism to fcntl over flock
Package-Manager: portage-2.2.28
mail-client/mutt/mutt-1.6.1-r2.ebuild | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
index 4188245..2d0f8ea 100644
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -154,17 +154,10 @@ src_configure() {
--with-regex \
--with-exec-shell=${EPREFIX}/bin/sh"
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf+=" --enable-fcntl --disable-flock"
- # wchar_t depends on locale
- myconf+=" --without-wc-funcs"
- ;;
- *)
- myconf+=" --disable-fcntl --enable-flock"
- ;;
- esac
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # arrows in index view do not show when using wchar_t
+ myconf+=" --without-wc-funcs"
+ fi
# mutt prioritizes gdbm over bdb, so we will too.
# hcache feature requires at least one database is in USE.
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-06-28 17:18 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-06-28 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 09bd028c885862c02c44efeaed8f5143f3f3e8e7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 17:17:16 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 17:17:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bd028c
mail-client/mutt: add USE=notmuch for latest version based on neomutt
Package-Manager: portage-2.2.28
mail-client/mutt/metadata.xml | 5 +++--
mail-client/mutt/mutt-1.6.1-r2.ebuild | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index b49c426..480b414 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -10,8 +10,9 @@
</maintainer>
<use>
<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
- <flag name="pop">Enable support for pop</flag>
- <flag name="sidebar">Use the vanilla tree + sidebar patch</flag>
+ <flag name="pop">Enable support for POP3</flag>
+ <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+ <flag name="sidebar">Enable the sidebar feature</flag>
<flag name="smime">Enable support for smime</flag>
<flag name="smtp">Enable support for smtp</flag>
<flag name="tokyocabinet">Enable tokyocabinet database backend for header
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
index 2d0f8ea..a3d89b2 100644
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.mutt.org/"
SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
https://github.com/neomutt/integration/archive/${NEOMUTT}.zip -> ${P}-neomutt-patches-${NEOMUTT}.zip"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
# this needs some testing due to full-on neomutt changes
@@ -66,6 +66,7 @@ CDEPEND="
!libressl? ( >=dev-libs/openssl-0.9.6:0 )
libressl? ( dev-libs/libressl )
)
+ notmuch? ( net-mail/notmuch )
slang? ( sys-libs/slang )
!slang? ( >=sys-libs/ncurses-5.2:0 )
"
@@ -142,6 +143,7 @@ src_configure() {
$(use_enable sidebar) \
$(use_enable smime) \
$(use_enable smtp) \
+ $(use_enable notmuch) \
$(use_with idn) \
$(use_with kerberos gss) \
$(use slang && echo --with-slang=${EPREFIX}/usr) \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-06-30 7:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-06-30 7:15 UTC (permalink / raw
To: gentoo-commits
commit: ee1937486a52b391ab51e6bbda651ae103bf67f2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 07:12:45 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 07:12:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee193748
mail-client/mutt: unleash 1.6.1-r2 into ~arch, full neomutt release, dropped many keywords due to missing notmuch dependency
Package-Manager: portage-2.2.28
mail-client/mutt/mutt-1.6.1-r2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
index a3d89b2..e2dbd10 100644
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -16,8 +16,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-# this needs some testing due to full-on neomutt changes
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-07-04 17:02 Tobias Klausmann
0 siblings, 0 replies; 249+ messages in thread
From: Tobias Klausmann @ 2016-07-04 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 1496aa8c370563167dc41a3224002e888ac407fb
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 17:01:37 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 17:01:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1496aa8c
mail-client/mutt-1.6.1-r2: add ~alpha keyword
Gentoo-Bug: 587560
mail-client/mutt/mutt-1.6.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
index e2dbd10..d868ccc 100644
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.6.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-07-09 15:48 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-07-09 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 2b6dd73b8ce4078cb0d809fee9b5b8cedab49861
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 14:27:12 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 15:48:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6dd73b
mail-client/mutt: version bump to 1.6.2, neomutt-20160709
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.6.2.ebuild | 260 +++++++++++++++++++++++++++++++++++++
2 files changed, 262 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 90a552f..c85304a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,3 +9,5 @@ DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0
DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
DIST mutt-1.6.1-neomutt-patches-3d90396616d009a7dcbfbb17d8a74b3eee70bd9a.zip 538034 SHA256 d76441eb51295afccc060bfee40ef03ab1b865de1187ea1f26349281d11784a6 SHA512 ca5334c9d0a295cba8749d1d7315d6d7a8ac93f48cfd9a1e112f9b5dd61f808966ec320464aab282cc626c08764294844368dca1520bc9dc6029c12004b7bb50 WHIRLPOOL b14ae9b58c6ba81956caefe049a0c6706436700e060402a9d869d9b98b61d74df5478dd07ee9cd520c4e6012a22b01d29857f74a8e3955680948e06f4e04cbec
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
+DIST mutt-1.6.2-patches-neomutt-20160709.tar.gz 498453 SHA256 9601f07fc163577f6222d2786c9ac8081d5498658e06ab1b646a16c6e2b61952 SHA512 9c0f069a82b72f5d1fc05c3edf4012a3044e2acf4cc1771bf7a4103c352bd165dd58e41f65434fb2e57464ce2981b3722c55e54b4c700b29863c7576f9cf1928 WHIRLPOOL 66291b9388bb089410146d53faddc540cf659caf129674cdbe8519eac89161c547e770a0094f630fff951b2cf8bf60404fe64804ae9c514c69301c1a3c894483
+DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
diff --git a/mail-client/mutt/mutt-1.6.2.ebuild b/mail-client/mutt/mutt-1.6.2.ebuild
new file mode 100644
index 0000000..1323117
--- /dev/null
+++ b/mail-client/mutt/mutt-1.6.2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+NEOMUTT="neomutt-20160709"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+ https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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}"/integration-${NEOMUTT}
+
+ # apply NeoMutt patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ # order of patches from README.md
+ local patches=(
+ bugs-common
+ features-common
+ features-extra
+ bugs-neomutt
+ gentoo-pre
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}"
+ EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+ || die "NeoMutt patchset ${patchset} failed"
+ done
+ # add some explanation as to why not going to upstream
+ sed -i \
+ -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
+ version.c || die "Failed to add bug instructions"
+
+ local upatches=
+ # allow user patches
+ eapply_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ rm VERSION.neo || die # we already flag it appropriate
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \
+ 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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable sidebar) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_enable notmuch) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ echo
+ elog "This version of Mutt is entirely based on NeoMutt patches."
+ elog "Please visit http://www.neomutt.org/ to learn more about this project."
+ elog "As a result, 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-07-10 15:23 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-07-10 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 246b085295a491cb702083a8308530867c50f5c4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 15:23:32 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 15:23:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246b0852
mail-client/mutt: fix USE=-sidebar, bug #588466
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.6.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c85304a..b02eeb1 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,5 +9,5 @@ DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0
DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
DIST mutt-1.6.1-neomutt-patches-3d90396616d009a7dcbfbb17d8a74b3eee70bd9a.zip 538034 SHA256 d76441eb51295afccc060bfee40ef03ab1b865de1187ea1f26349281d11784a6 SHA512 ca5334c9d0a295cba8749d1d7315d6d7a8ac93f48cfd9a1e112f9b5dd61f808966ec320464aab282cc626c08764294844368dca1520bc9dc6029c12004b7bb50 WHIRLPOOL b14ae9b58c6ba81956caefe049a0c6706436700e060402a9d869d9b98b61d74df5478dd07ee9cd520c4e6012a22b01d29857f74a8e3955680948e06f4e04cbec
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
-DIST mutt-1.6.2-patches-neomutt-20160709.tar.gz 498453 SHA256 9601f07fc163577f6222d2786c9ac8081d5498658e06ab1b646a16c6e2b61952 SHA512 9c0f069a82b72f5d1fc05c3edf4012a3044e2acf4cc1771bf7a4103c352bd165dd58e41f65434fb2e57464ce2981b3722c55e54b4c700b29863c7576f9cf1928 WHIRLPOOL 66291b9388bb089410146d53faddc540cf659caf129674cdbe8519eac89161c547e770a0094f630fff951b2cf8bf60404fe64804ae9c514c69301c1a3c894483
+DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
diff --git a/mail-client/mutt/mutt-1.6.2.ebuild b/mail-client/mutt/mutt-1.6.2.ebuild
index 1323117..6562b57 100644
--- a/mail-client/mutt/mutt-1.6.2.ebuild
+++ b/mail-client/mutt/mutt-1.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-NEOMUTT="neomutt-20160709"
+NEOMUTT="neomutt-20160710"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-08-22 9:33 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-08-22 9:33 UTC (permalink / raw
To: gentoo-commits
commit: c194bd87ebd69a55fcfe0f62b41389ca7bd16caa
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 09:33:22 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 09:33:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c194bd87
mail-client/mutt: remove old
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 5 -
mail-client/mutt/mutt-1.5.23-r5.ebuild | 250 -----------------------------
mail-client/mutt/mutt-1.5.23-r8.ebuild | 252 ------------------------------
mail-client/mutt/mutt-1.5.24-r1.ebuild | 254 ------------------------------
mail-client/mutt/mutt-1.6.0-r2.ebuild | 277 ---------------------------------
mail-client/mutt/mutt-1.6.1-r2.ebuild | 260 -------------------------------
6 files changed, 1298 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b02eeb1..8825d7a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,13 +1,8 @@
-DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d24728df388c5c90eed3276783db061b92212786f3 SHA512 8f89abcca7048a24f5e37190b479f724eb51eb6a1703bc419c9f200f4ad1cb544fa7283ea6d76519f002aed26c9c2f54bd14e89b845001755a0b98e3317b39f8 WHIRLPOOL 04843ec6df35a34b2f601caaff60c6cd2fe16ab66946c6ab0a3be0ff4570743fdc365f7fb28c00c16b6d88e299d0b1b8fac86e8936474e170d1f0d2331209e2c
DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
-DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.0-gentoo-patches-r6.tar.xz 102716 SHA256 7130215f78f69389d9c2520db0ef568c23d9cf508cfec9c058c846b01c53cce6 SHA512 60d47196a3daee1b976bc8a48b0b2f5b73e08106765bfad9cc5a63f9078fea1f86c2ed20365da9f36392b87f1da32a16646c4a20e76ab621038d3b5af388ee5f WHIRLPOOL 445b9d2f33c3a5cbc53cacdf6417945fcd95b8b99e76b77593dd68895f592beed64c44142d7df5467b3f22984d473e150f96e02a7e2d0177621361067457947f
-DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac
DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
-DIST mutt-1.6.1-neomutt-patches-3d90396616d009a7dcbfbb17d8a74b3eee70bd9a.zip 538034 SHA256 d76441eb51295afccc060bfee40ef03ab1b865de1187ea1f26349281d11784a6 SHA512 ca5334c9d0a295cba8749d1d7315d6d7a8ac93f48cfd9a1e112f9b5dd61f808966ec320464aab282cc626c08764294844368dca1520bc9dc6029c12004b7bb50 WHIRLPOOL b14ae9b58c6ba81956caefe049a0c6706436700e060402a9d869d9b98b61d74df5478dd07ee9cd520c4e6012a22b01d29857f74a8e3955680948e06f4e04cbec
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
diff --git a/mail-client/mutt/mutt-1.5.23-r5.ebuild b/mail-client/mutt/mutt-1.5.23-r5.ebuild
deleted file mode 100644
index 877cd5b..0000000
--- a/mail-client/mutt/mutt-1.5.23-r5.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r5"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? ( >=dev-libs/openssl-0.9.6 )
- slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2 )
-"
-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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- # we conditionalise this one, simply because it has considerable
- # impact on the code
- if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-20140412.patch
- epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
- epatch "${PATCHDIR}"/sidebar-counts.patch
- fi
-
- local upatches=
- # allow user patches
- epatch_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang) \
- --enable-compressed \
- --enable-external-dotlock \
- --enable-nfs-fix \
- --sysconfdir=${EPREFIX}/etc/${PN} \
- --with-curses \
- --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
- --with-regex \
- --with-exec-shell=${EPREFIX}/bin/sh"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf="${myconf} --enable-fcntl --disable-flock"
- ;;
- *)
- myconf="${myconf} --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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() {
- 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
-}
diff --git a/mail-client/mutt/mutt-1.5.23-r8.ebuild b/mail-client/mutt/mutt-1.5.23-r8.ebuild
deleted file mode 100644
index 49771a2..0000000
--- a/mail-client/mutt/mutt-1.5.23-r8.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r8"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? ( >=dev-libs/openssl-0.9.6 )
- slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2 )
-"
-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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- # we conditionalise this one, simply because it has considerable
- # impact on the code
- if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-20140412.patch
- epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
- epatch "${PATCHDIR}"/sidebar-counts.patch
- fi
-
- local upatches=
- # allow user patches
- epatch_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang) \
- --enable-compressed \
- --enable-external-dotlock \
- --enable-nfs-fix \
- --sysconfdir=${EPREFIX}/etc/${PN} \
- --with-curses \
- --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
- --with-regex \
- --with-exec-shell=${EPREFIX}/bin/sh"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf="${myconf} --enable-fcntl --disable-flock"
- ;;
- *)
- myconf="${myconf} --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- fi
-}
diff --git a/mail-client/mutt/mutt-1.5.24-r1.ebuild b/mail-client/mutt/mutt-1.5.24-r1.ebuild
deleted file mode 100644
index 3860e13..0000000
--- a/mail-client/mutt/mutt-1.5.24-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r1"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? ( >=dev-libs/openssl-0.9.6 )
- slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2 )
-"
-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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- # we conditionalise this one, simply because it has considerable
- # impact on the code
- if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-20140412.patch
- epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
- epatch "${PATCHDIR}"/sidebar-counts.patch
- fi
-
- local upatches=
- # allow user patches
- epatch_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf+=" --enable-fcntl --disable-flock"
- # wchar_t depends on locale
- myconf+=" --without-wc-funcs"
- ;;
- *)
- myconf+=" --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- fi
-}
diff --git a/mail-client/mutt/mutt-1.6.0-r2.ebuild b/mail-client/mutt/mutt-1.6.0-r2.ebuild
deleted file mode 100644
index 74da155..0000000
--- a/mail-client/mutt/mutt-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r6"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.xz
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.xz"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- 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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- # Avoid symbol conflicts on Solaris
- sed -i \
- -e 's/\<M_CMD\>/MT_CMD/g' \
- -e 's/\<M_READ\>/MT_READ/g' \
- *.[ch] imap/*.[ch] || die
-
- local upatches=
- # allow user patches
- eapply_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable sidebar) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf+=" --enable-fcntl --disable-flock"
- # wchar_t depends on locale
- myconf+=" --without-wc-funcs"
- ;;
- *)
- myconf+=" --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- elif use sidebar ; then
- echo
- elog "The sidebar patch has changed config names, please see"
- elog "the following page for a list of new names:"
- elog "http://www.neomutt.org/sidebar-intro.html#intro-sidebar-config-changes"
- echo
- fi
-}
diff --git a/mail-client/mutt/mutt-1.6.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild
deleted file mode 100644
index d868ccc..0000000
--- a/mail-client/mutt/mutt-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-NEOMUTT="3d90396616d009a7dcbfbb17d8a74b3eee70bd9a" # 20160611
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- https://github.com/neomutt/integration/archive/${NEOMUTT}.zip -> ${P}-neomutt-patches-${NEOMUTT}.zip"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- 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}"/integration-${NEOMUTT}
-
- # apply NeoMutt patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- # order of patches from README.md
- local patches=(
- features-common
- features-extra
- bugs-neomutt
- gentoo-pre
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}"
- EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
- || die "NeoMutt patchset ${patchset} failed"
- done
- # add some explanation as to why not going to upstream
- sed -i \
- -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
- version.c || die "Failed to add bug instructions"
-
- epatch "${FILESDIR}"/mutt-1.6.1-neomutt-index_format_truncation_problem.patch
- local upatches=
- # allow user patches
- eapply_user && upatches=" with user patches"
-
- # patch version string for bug reports
- rm VERSION.neo || die # we already flag it appropriate
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \
- 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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable sidebar) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_enable notmuch) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- echo
- elog "This version of Mutt is entirely based on NeoMutt patches."
- elog "Please visit http://www.neomutt.org/ to learn more about this project."
- elog "As a result, 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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-01 13:08 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-01 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 7e18cbcde5883a589de28e3dbdc3a6528261725b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 1 13:07:09 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 13:08:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e18cbcd
mail-client/mutt: version bump to 1.7.0
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.7.0.ebuild | 263 +++++++++++++++++++++++++++++++++++++
2 files changed, 265 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8825d7a..db81b94 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -6,3 +6,5 @@ DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb36748
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
+DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
+DIST mutt-gentoo-1.7.0-patches-r0.tar.xz 150888 SHA256 1df4e408ad4acadeb9cc44570b43b145bb096619d436a27cfb62904c223fd796 SHA512 69e9d487ace18d25e0bdf44d78b9e382d4bd2ef3e2878836cbc62af1a58486191716085a82e064f758fc5bf410fee1108c371fea25bf12aba28e22f042cfdb21 WHIRLPOOL cd566c849b3f1ce276011f9867d5537b4bfac1a161fc1e2bc800ca662c5f4fd9ddabba4decfb45e71cc8748fddc5a72e9ca1c51e1dc191500c1de7ccbd03e370
diff --git a/mail-client/mutt/mutt-1.7.0.ebuild b/mail-client/mutt/mutt-1.7.0.ebuild
new file mode 100644
index 00000000..ac0fa93
--- /dev/null
+++ b/mail-client/mutt/mutt-1.7.0.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+#NEOMUTT="neomutt-20160710"
+NEOMUTT="gentoo r0"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+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-gentoo-1.7.0-patches-r0.tar.xz"
+ #https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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}"/integration-${NEOMUTT}
+ local PATCHDIR="${WORKDIR}"/gentoo-mutt-1.7.0-patches
+
+ # apply NeoMutt patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ # order of patches from README.md
+ local patches=(
+ #bugs-common
+ bugs-gentoo
+ features-common
+ features-extra
+ #bugs-neomutt
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}"
+ EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+ || die "NeoMutt patchset ${patchset} failed"
+ done
+ # add some explanation as to why not going to upstream
+ sed -i \
+ -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
+ version.c || die "Failed to add bug instructions"
+
+ local upatches=
+ # allow user patches
+ eapply_user && upatches=" with user patches"
+
+ # patch version string for bug reports
+ #rm VERSION.neo || die # we already flag it appropriate
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \
+ 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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable sidebar) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_enable notmuch) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+ echo
+ elog "This version of Mutt is entirely based on NeoMutt patches."
+ elog "Please visit http://www.neomutt.org/ to learn more about this project."
+ elog "As a result, 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-04 12:59 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-04 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 560f2dea5014c6993982dc8f0ccd6977105e8434
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 12:59:19 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 12:59:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560f2dea
mail-client/mutt: revbump for fixes for bugs #592664 and #592680
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.0.ebuild => mutt-1.7.0-r1.ebuild} | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index db81b94..5cff255 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
-DIST mutt-gentoo-1.7.0-patches-r0.tar.xz 150888 SHA256 1df4e408ad4acadeb9cc44570b43b145bb096619d436a27cfb62904c223fd796 SHA512 69e9d487ace18d25e0bdf44d78b9e382d4bd2ef3e2878836cbc62af1a58486191716085a82e064f758fc5bf410fee1108c371fea25bf12aba28e22f042cfdb21 WHIRLPOOL cd566c849b3f1ce276011f9867d5537b4bfac1a161fc1e2bc800ca662c5f4fd9ddabba4decfb45e71cc8748fddc5a72e9ca1c51e1dc191500c1de7ccbd03e370
+DIST mutt-gentoo-1.7.0-patches-r1.tar.xz 151928 SHA256 b9d903c5a1b76e5a3bf1f2889b58c5739fa4611cdcdca372948c2f4c23e01512 SHA512 f51d914732aac74233e4aaebc01bb818a235cdf2e0ab9a160f789de90b598eb727cea4d44c954388d1da368dacd8f7a1c99307d73440c39078b30b52fa88f6ae WHIRLPOOL 181deee750538ef3d66019095051dd8992b40e2e0b6f1eee43278396891e5c1cdb4a0ea79522ae19c6a6ffeeabdb6d25b217d2b8efe4114928ac8bc48a85a8a9
diff --git a/mail-client/mutt/mutt-1.7.0.ebuild b/mail-client/mutt/mutt-1.7.0-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.0.ebuild
rename to mail-client/mutt/mutt-1.7.0-r1.ebuild
index ac0fa93..85b30b7 100644
--- a/mail-client/mutt/mutt-1.7.0.ebuild
+++ b/mail-client/mutt/mutt-1.7.0-r1.ebuild
@@ -7,13 +7,13 @@ EAPI="6"
inherit eutils flag-o-matic autotools
#NEOMUTT="neomutt-20160710"
-NEOMUTT="gentoo r0"
+NEOMUTT="gentoo-r1"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
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-gentoo-1.7.0-patches-r0.tar.xz"
+ https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.0-patches-r1.tar.xz"
#https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
@@ -92,6 +92,7 @@ src_prepare() {
export EPATCH_SUFFIX="patch"
# order of patches from README.md
local patches=(
+ patches-mutt
#bugs-common
bugs-gentoo
features-common
@@ -107,7 +108,7 @@ src_prepare() {
done
# add some explanation as to why not going to upstream
sed -i \
- -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
+ -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n"' \
version.c || die "Failed to add bug instructions"
local upatches=
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-04 15:04 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-04 15:04 UTC (permalink / raw
To: gentoo-commits
commit: ee84fb878884a350cc2956fdd0b2f5ea3384a6d3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 14:47:55 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 15:04:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee84fb87
mail-client/mutt: revbump for using correct patchset
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.0-r1.ebuild => mutt-1.7.0-r2.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 5cff255..2fe93ec 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
-DIST mutt-gentoo-1.7.0-patches-r1.tar.xz 151928 SHA256 b9d903c5a1b76e5a3bf1f2889b58c5739fa4611cdcdca372948c2f4c23e01512 SHA512 f51d914732aac74233e4aaebc01bb818a235cdf2e0ab9a160f789de90b598eb727cea4d44c954388d1da368dacd8f7a1c99307d73440c39078b30b52fa88f6ae WHIRLPOOL 181deee750538ef3d66019095051dd8992b40e2e0b6f1eee43278396891e5c1cdb4a0ea79522ae19c6a6ffeeabdb6d25b217d2b8efe4114928ac8bc48a85a8a9
+DIST mutt-gentoo-1.7.0-patches-r2.tar.xz 151692 SHA256 2b835af218720271ecaf013ad9bd3435ca1a44bf799dded2dfec8d656e058795 SHA512 e4ae8068f5cb0393ad652856cb8c70b0bdc3723f4ef3ac10f718803988b9365de401ce1ffcadf6ebb34099c472672a48a4c8eb4c9dcd62b0be3263e92b378edb WHIRLPOOL b3dedc8e59b6870a58367bf251205af2bf7d53613fa9b27f5327f0bb4037fd4798d8dde91ee3a2e45600f1c7efaf3d4881ce137d4f1479f4cac9f5cd7166c855
diff --git a/mail-client/mutt/mutt-1.7.0-r1.ebuild b/mail-client/mutt/mutt-1.7.0-r2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.0-r1.ebuild
rename to mail-client/mutt/mutt-1.7.0-r2.ebuild
index 85b30b7..8fa5ace 100644
--- a/mail-client/mutt/mutt-1.7.0-r1.ebuild
+++ b/mail-client/mutt/mutt-1.7.0-r2.ebuild
@@ -7,13 +7,13 @@ EAPI="6"
inherit eutils flag-o-matic autotools
#NEOMUTT="neomutt-20160710"
-NEOMUTT="gentoo-r1"
+NEOMUTT="gentoo-r${PVR}"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
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-gentoo-1.7.0-patches-r1.tar.xz"
+ https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.0-patches-r2.tar.xz"
#https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-06 7:48 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-06 7:48 UTC (permalink / raw
To: gentoo-commits
commit: cdef19bbc711e7dac790d6039bbf5613f81c96b7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 07:48:20 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 07:48:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdef19bb
mail-client/mutt: revbump for latest upstream fixes
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.0-r2.ebuild => mutt-1.7.0-r3.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2fe93ec..bd9c8be 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
-DIST mutt-gentoo-1.7.0-patches-r2.tar.xz 151692 SHA256 2b835af218720271ecaf013ad9bd3435ca1a44bf799dded2dfec8d656e058795 SHA512 e4ae8068f5cb0393ad652856cb8c70b0bdc3723f4ef3ac10f718803988b9365de401ce1ffcadf6ebb34099c472672a48a4c8eb4c9dcd62b0be3263e92b378edb WHIRLPOOL b3dedc8e59b6870a58367bf251205af2bf7d53613fa9b27f5327f0bb4037fd4798d8dde91ee3a2e45600f1c7efaf3d4881ce137d4f1479f4cac9f5cd7166c855
+DIST mutt-gentoo-1.7.0-patches-r3.tar.xz 152136 SHA256 eb6a552ca4d99a34d3906b1384aebe7486dd2f0ad490a5a91b076a46da045e90 SHA512 39105278026503d218df00cbbc093f94c3fe2ffbbf57dbce7bddcad7262c2e5016c50be29899037d62335d6e3d1701c21fb6ef43dbf76bb416e282ba763880b2 WHIRLPOOL 635398effba7107f767f042bfd171bbe643c00b3469adc13952a3f55addfb6f3af5155d45e9b04219a7a349f8dbc18779f21004fb8a47958f679a4251460ef99
diff --git a/mail-client/mutt/mutt-1.7.0-r2.ebuild b/mail-client/mutt/mutt-1.7.0-r3.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.0-r2.ebuild
rename to mail-client/mutt/mutt-1.7.0-r3.ebuild
index 8fa5ace..760de2b 100644
--- a/mail-client/mutt/mutt-1.7.0-r2.ebuild
+++ b/mail-client/mutt/mutt-1.7.0-r3.ebuild
@@ -7,13 +7,13 @@ EAPI="6"
inherit eutils flag-o-matic autotools
#NEOMUTT="neomutt-20160710"
-NEOMUTT="gentoo-r${PVR}"
+NEOMUTT="gentoo-${PVR}"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
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-gentoo-1.7.0-patches-r2.tar.xz"
+ https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.0-patches-r3.tar.xz"
#https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-13 8:08 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-13 8:08 UTC (permalink / raw
To: gentoo-commits
commit: f8e1676b51e9124472f0c63593f6899cb7d02a74
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 08:07:57 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 08:08:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e1676b
mail-client/mutt: revbump for bug #593234
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.0-r3.ebuild => mutt-1.7.0-r4.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index bd9c8be..177c1d4 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
-DIST mutt-gentoo-1.7.0-patches-r3.tar.xz 152136 SHA256 eb6a552ca4d99a34d3906b1384aebe7486dd2f0ad490a5a91b076a46da045e90 SHA512 39105278026503d218df00cbbc093f94c3fe2ffbbf57dbce7bddcad7262c2e5016c50be29899037d62335d6e3d1701c21fb6ef43dbf76bb416e282ba763880b2 WHIRLPOOL 635398effba7107f767f042bfd171bbe643c00b3469adc13952a3f55addfb6f3af5155d45e9b04219a7a349f8dbc18779f21004fb8a47958f679a4251460ef99
+DIST mutt-gentoo-1.7.0-patches-r4.tar.xz 154796 SHA256 30cf0b2da5d2e70bd4ee0f56fd6b70949893bc8c6fd6f690b5ad222146342ef6 SHA512 307e02be1fa933232196688825cf0f5f95c3150ce33cd0b8e4b5859dc1df9af86160cd34d5553a4a19e759405d44bd43b3d6e8e670f650341f0f452939dfba5a WHIRLPOOL dec8607c7758ab0a00ddc5c4d6f826739942046603ef6bc1018dc84b716f5fbd887c2581985fdd3ed823c85ae9656de096843441b0b57f8934f9049f480e97fb
diff --git a/mail-client/mutt/mutt-1.7.0-r3.ebuild b/mail-client/mutt/mutt-1.7.0-r4.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.0-r3.ebuild
rename to mail-client/mutt/mutt-1.7.0-r4.ebuild
index 760de2b..0aff2a1 100644
--- a/mail-client/mutt/mutt-1.7.0-r3.ebuild
+++ b/mail-client/mutt/mutt-1.7.0-r4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
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-gentoo-1.7.0-patches-r3.tar.xz"
+ https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.0-patches-r4.tar.xz"
#https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-18 13:17 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-18 13:17 UTC (permalink / raw
To: gentoo-commits
commit: e741758ef6abc12874f62cedc4021e18f018e762
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 13:16:20 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 13:16:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e741758e
mail-client/mutt: revise 1.7.0 ebuild
- drop NeoMutt references since we're no longer on it
- re-introduce USE=vanilla for upstream bug reports
- only show SmartTime warning for upgrade to 1.7
Package-Manager: portage-2.2.28
mail-client/mutt/mutt-1.7.0-r4.ebuild | 78 ++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 38 deletions(-)
diff --git a/mail-client/mutt/mutt-1.7.0-r4.ebuild b/mail-client/mutt/mutt-1.7.0-r4.ebuild
index 0aff2a1..470118b 100644
--- a/mail-client/mutt/mutt-1.7.0-r4.ebuild
+++ b/mail-client/mutt/mutt-1.7.0-r4.ebuild
@@ -6,16 +6,16 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-#NEOMUTT="neomutt-20160710"
-NEOMUTT="gentoo-${PVR}"
+PATCHREV="r4"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-1.7.0-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-gentoo-1.7.0-patches-r4.tar.xz"
- #https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+ https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -84,40 +84,37 @@ RDEPEND="${CDEPEND}
"
src_prepare() {
- #local PATCHDIR="${WORKDIR}"/integration-${NEOMUTT}
local PATCHDIR="${WORKDIR}"/gentoo-mutt-1.7.0-patches
- # apply NeoMutt patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- # order of patches from README.md
- local patches=(
- patches-mutt
- #bugs-common
- bugs-gentoo
- features-common
- features-extra
- #bugs-neomutt
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}"
- EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
- || die "NeoMutt patchset ${patchset} failed"
- done
- # add some explanation as to why not going to upstream
- sed -i \
- -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n"' \
- version.c || die "Failed to add bug instructions"
+ if use !vanilla ; then
+ # apply patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ local patches=(
+ patches-mutt
+ bugs-gentoo
+ features-common
+ features-extra
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ 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_(/a\"This 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"' \
+ version.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
- #rm VERSION.neo || die # we already flag it appropriate
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \
+ 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
@@ -253,12 +250,17 @@ pkg_postinst() {
elog " https://wiki.gentoo.org/wiki/Mutt"
echo
else
- echo
- elog "This version of Mutt is entirely based on NeoMutt patches."
- elog "Please visit http://www.neomutt.org/ to learn more about this project."
- elog "As a result, 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
+ 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
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-09-23 8:04 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-09-23 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 39d20f203504f8b5e68b6f5be68ca81c07a2e5de
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 08:03:39 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 08:03:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39d20f20
mail-client/mutt: revbump to include upstream fixes, bug #593692
Package-Manager: portage-2.2.28
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.0-r4.ebuild => mutt-1.7.0-r5.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 177c1d4..2aed7b0 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
-DIST mutt-gentoo-1.7.0-patches-r4.tar.xz 154796 SHA256 30cf0b2da5d2e70bd4ee0f56fd6b70949893bc8c6fd6f690b5ad222146342ef6 SHA512 307e02be1fa933232196688825cf0f5f95c3150ce33cd0b8e4b5859dc1df9af86160cd34d5553a4a19e759405d44bd43b3d6e8e670f650341f0f452939dfba5a WHIRLPOOL dec8607c7758ab0a00ddc5c4d6f826739942046603ef6bc1018dc84b716f5fbd887c2581985fdd3ed823c85ae9656de096843441b0b57f8934f9049f480e97fb
+DIST mutt-gentoo-1.7.0-patches-r5.tar.xz 157172 SHA256 d9370439e6200d75ba9c6705561a408325c07b18f248f59457b45fa09cb080b0 SHA512 758a189ec33d346f4dcc9afad7d5d8b7092c89917a7fe40fbb75803fde0469d8dd197bc360d6e7a3897210973846bec6f7451bee3e4c6b1296e0d8fe8d0db39d WHIRLPOOL 6d26015f7827b182941b9903a2ee0ddaeee2788047c50fb8e67c4466f8403a83252139185cddd72058f790c465783f4e1e637c6fb936a3b25a58f6062458de27
diff --git a/mail-client/mutt/mutt-1.7.0-r4.ebuild b/mail-client/mutt/mutt-1.7.0-r5.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.0-r4.ebuild
rename to mail-client/mutt/mutt-1.7.0-r5.ebuild
index 470118b..59e2726 100644
--- a/mail-client/mutt/mutt-1.7.0-r4.ebuild
+++ b/mail-client/mutt/mutt-1.7.0-r5.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r4"
+PATCHREV="r5"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-09 17:49 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-09 17:49 UTC (permalink / raw
To: gentoo-commits
commit: b4169e273b22e6d9262b60f292ef7d2938881e15
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 17:47:32 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 17:47:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4169e27
mail-client/mutt: vesion bump to 1.7.1
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.7.1.ebuild | 266 +++++++++++++++++++++++++++++++++++++
2 files changed, 268 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2aed7b0..c5b37e5 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,6 @@ DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded64
DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
+DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
DIST mutt-gentoo-1.7.0-patches-r5.tar.xz 157172 SHA256 d9370439e6200d75ba9c6705561a408325c07b18f248f59457b45fa09cb080b0 SHA512 758a189ec33d346f4dcc9afad7d5d8b7092c89917a7fe40fbb75803fde0469d8dd197bc360d6e7a3897210973846bec6f7451bee3e4c6b1296e0d8fe8d0db39d WHIRLPOOL 6d26015f7827b182941b9903a2ee0ddaeee2788047c50fb8e67c4466f8403a83252139185cddd72058f790c465783f4e1e637c6fb936a3b25a58f6062458de27
+DIST mutt-gentoo-1.7.1-patches-r0.tar.xz 150172 SHA256 b82859c3ef15ae2225b0ff53e3ff5f7354d7db51a5716eeefae6fe411aafbc9b SHA512 0d4ccff4ad87afe2fdb4603fedf9137d3af80f1b7a6920d7746bc553159369497ee0c0a1e0f40b10ddc3abcfa7f771cc82f8e3565ee430c55198dca5fe68cbd9 WHIRLPOOL d001a5b7e415b9670e1fbbe563365962a44ad0bc65f8b5707908aa48f3ba684d7f573dd19369b6ddef4d74f288b5dc5ec050195ddbfaf3241207797c2b788203
diff --git a/mail-client/mutt/mutt-1.7.1.ebuild b/mail-client/mutt/mutt-1.7.1.ebuild
new file mode 100644
index 00000000..d8843bd
--- /dev/null
+++ b/mail-client/mutt/mutt-1.7.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17 )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0 )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ 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}"/gentoo-mutt-${PV}-patches
+
+ if use !vanilla ; then
+ # apply patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ local patches=(
+ patches-mutt
+ bugs-gentoo
+ features-common
+ features-extra
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ 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_(/a\"This 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"' \
+ version.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
+ 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"
+
+ # don't just build documentation (lengthy process, with big dependencies)
+ if use !doc ; then
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+ fi
+}
+
+src_configure() {
+ local myconf="
+ $(use_enable crypt pgp) \
+ $(use_enable debug) \
+ $(use_enable gpg gpgme) \
+ $(use_enable imap) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable pop) \
+ $(use_enable sidebar) \
+ $(use_enable smime) \
+ $(use_enable smtp) \
+ $(use_enable notmuch) \
+ $(use_with idn) \
+ $(use_with kerberos gss) \
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \
+ $(use !slang && echo --with-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
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ if use tokyocabinet; then
+ myconf="${myconf} --enable-hcache \
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ elif use qdbm; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+ elif use gdbm ; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+ elif use berkdb; then
+ myconf="${myconf} --enable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ else
+ myconf="${myconf} --disable-hcache \
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ fi
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf="${myconf} --with-gnutls"
+ elif use ssl; then
+ myconf="${myconf} --with-ssl"
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf="${myconf} $(use_with sasl)"
+ else
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ fi
+
+ if use mbox; then
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ else
+ myconf="${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 /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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-13 16:06 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-13 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 23280c98a3f538da38e27c463a6d604f5e79bad6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 16:02:17 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23280c98
mail-client/mutt: drop unstable keywords from oldest ebuild
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.5.23-r7.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index da0cf15..5916079 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="ia64 sparc" # last stable
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-13 16:06 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-13 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 91e02ef06993d6d90b9ddb275d0fc2ddaef1f01f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 15:39:26 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e02ef0
mail-client/mutt: revbump 1.7.1 for latest upstream fixes/features
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.1.ebuild => mutt-1.7.1-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c5b37e5..cdfec20 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,4 +9,4 @@ DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47
DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
DIST mutt-gentoo-1.7.0-patches-r5.tar.xz 157172 SHA256 d9370439e6200d75ba9c6705561a408325c07b18f248f59457b45fa09cb080b0 SHA512 758a189ec33d346f4dcc9afad7d5d8b7092c89917a7fe40fbb75803fde0469d8dd197bc360d6e7a3897210973846bec6f7451bee3e4c6b1296e0d8fe8d0db39d WHIRLPOOL 6d26015f7827b182941b9903a2ee0ddaeee2788047c50fb8e67c4466f8403a83252139185cddd72058f790c465783f4e1e637c6fb936a3b25a58f6062458de27
-DIST mutt-gentoo-1.7.1-patches-r0.tar.xz 150172 SHA256 b82859c3ef15ae2225b0ff53e3ff5f7354d7db51a5716eeefae6fe411aafbc9b SHA512 0d4ccff4ad87afe2fdb4603fedf9137d3af80f1b7a6920d7746bc553159369497ee0c0a1e0f40b10ddc3abcfa7f771cc82f8e3565ee430c55198dca5fe68cbd9 WHIRLPOOL d001a5b7e415b9670e1fbbe563365962a44ad0bc65f8b5707908aa48f3ba684d7f573dd19369b6ddef4d74f288b5dc5ec050195ddbfaf3241207797c2b788203
+DIST mutt-gentoo-1.7.1-patches-r1.tar.xz 151368 SHA256 f70d1cd72fbba24b0ab18fcd60a43c61c416b17185c740f97f7a8c3dda182acc SHA512 3ba00cccea6029986db2c75343a86ed6a1da8e55c4066c7a99a54a8612c1e5d8512e5d58e49be9d6721c8a989775042415ec49055680ac120d267a304bf41f4c WHIRLPOOL c120f0108d6323e4d1b1597f3a491c2c842825aabf3ac876ab2c7d5c8360a8465ec46eea1b1a5953a28fcf91439971c053e4b806e3dbdf34d5a966f827944ff2
diff --git a/mail-client/mutt/mutt-1.7.1.ebuild b/mail-client/mutt/mutt-1.7.1-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.1.ebuild
rename to mail-client/mutt/mutt-1.7.1-r1.ebuild
index d8843bd..a9e98c7 100644
--- a/mail-client/mutt/mutt-1.7.1.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-13 16:06 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-13 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 31d2fc131967cf504fe6e816b5f8697868511b90
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 16:06:13 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d2fc13
mail-client/mutt: remove old ebuilds
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 6 -
mail-client/mutt/mutt-1.6.1-r1.ebuild | 271 ----------------------------------
mail-client/mutt/mutt-1.6.2.ebuild | 260 --------------------------------
mail-client/mutt/mutt-1.7.0-r5.ebuild | 266 ---------------------------------
4 files changed, 803 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cdfec20..ff7c8bd 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,11 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc8
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
-DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
-DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04 WHIRLPOOL fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
-DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
-DIST mutt-1.7.0.tar.gz 4019567 SHA256 1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612 WHIRLPOOL 90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.0-patches-r5.tar.xz 157172 SHA256 d9370439e6200d75ba9c6705561a408325c07b18f248f59457b45fa09cb080b0 SHA512 758a189ec33d346f4dcc9afad7d5d8b7092c89917a7fe40fbb75803fde0469d8dd197bc360d6e7a3897210973846bec6f7451bee3e4c6b1296e0d8fe8d0db39d WHIRLPOOL 6d26015f7827b182941b9903a2ee0ddaeee2788047c50fb8e67c4466f8403a83252139185cddd72058f790c465783f4e1e637c6fb936a3b25a58f6062458de27
DIST mutt-gentoo-1.7.1-patches-r1.tar.xz 151368 SHA256 f70d1cd72fbba24b0ab18fcd60a43c61c416b17185c740f97f7a8c3dda182acc SHA512 3ba00cccea6029986db2c75343a86ed6a1da8e55c4066c7a99a54a8612c1e5d8512e5d58e49be9d6721c8a989775042415ec49055680ac120d267a304bf41f4c WHIRLPOOL c120f0108d6323e4d1b1597f3a491c2c842825aabf3ac876ab2c7d5c8360a8465ec46eea1b1a5953a28fcf91439971c053e4b806e3dbdf34d5a966f827944ff2
diff --git a/mail-client/mutt/mutt-1.6.1-r1.ebuild b/mail-client/mutt/mutt-1.6.1-r1.ebuild
deleted file mode 100644
index edd3d08..00000000
--- a/mail-client/mutt/mutt-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r5"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.xz
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.xz"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- 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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- local upatches=
- # allow user patches
- eapply_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable sidebar) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf+=" --enable-fcntl --disable-flock"
- # wchar_t depends on locale
- myconf+=" --without-wc-funcs"
- ;;
- *)
- myconf+=" --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- elif use sidebar ; then
- echo
- elog "The sidebar patch has changed config names, please see"
- elog "the following page for a list of new names:"
- elog "http://www.neomutt.org/sidebar-intro.html#intro-sidebar-config-changes"
- echo
- fi
-}
diff --git a/mail-client/mutt/mutt-1.6.2.ebuild b/mail-client/mutt/mutt-1.6.2.ebuild
deleted file mode 100644
index 6562b57..00000000
--- a/mail-client/mutt/mutt-1.6.2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-NEOMUTT="neomutt-20160710"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- 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}"/integration-${NEOMUTT}
-
- # apply NeoMutt patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- # order of patches from README.md
- local patches=(
- bugs-common
- features-common
- features-extra
- bugs-neomutt
- gentoo-pre
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}"
- EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
- || die "NeoMutt patchset ${patchset} failed"
- done
- # add some explanation as to why not going to upstream
- sed -i \
- -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n\\n"' \
- version.c || die "Failed to add bug instructions"
-
- local upatches=
- # allow user patches
- eapply_user && upatches=" with user patches"
-
- # patch version string for bug reports
- rm VERSION.neo || die # we already flag it appropriate
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \
- 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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable sidebar) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_enable notmuch) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- echo
- elog "This version of Mutt is entirely based on NeoMutt patches."
- elog "Please visit http://www.neomutt.org/ to learn more about this project."
- elog "As a result, 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
-}
diff --git a/mail-client/mutt/mutt-1.7.0-r5.ebuild b/mail-client/mutt/mutt-1.7.0-r5.ebuild
deleted file mode 100644
index 59e2726..00000000
--- a/mail-client/mutt/mutt-1.7.0-r5.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r5"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-1.7.0-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 idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
- )
- 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}"/gentoo-mutt-1.7.0-patches
-
- if use !vanilla ; then
- # apply patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- local patches=(
- patches-mutt
- bugs-gentoo
- features-common
- features-extra
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- 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_(/a\"This 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"' \
- version.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
- 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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable sidebar) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_enable notmuch) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-13 16:06 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-13 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 69844c31d2cd0f140dc003cbe3c6d2dee16325e7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 15:59:41 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69844c31
mail-client/mutt: cleanup econf arguments
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.7.1-r1.ebuild | 101 +++++++++++++++++++---------------
1 file changed, 56 insertions(+), 45 deletions(-)
diff --git a/mail-client/mutt/mutt-1.7.1-r1.ebuild b/mail-client/mutt/mutt-1.7.1-r1.ebuild
index a9e98c7..27fe71b 100644
--- a/mail-client/mutt/mutt-1.7.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r1.ebuild
@@ -132,74 +132,85 @@ src_prepare() {
}
src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable sidebar) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_enable notmuch) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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"
+ local myconf=(
+ "$(use_enable crypt pgp)"
+ "$(use_enable debug)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable imap)"
+ "$(use_enable nls)"
+ "$(use_enable nntp)"
+ "$(use_enable pop)"
+ "$(use_enable sidebar)"
+ "$(use_enable smime)"
+ "$(use_enable smtp)"
+ "$(use_enable notmuch)"
+ "$(use_with idn)"
+ "$(use_with kerberos gss)"
+ "--with-$(use slang && echo slang || echo 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"
+ myconf+=( "--without-wc-funcs" )
fi
# mutt prioritizes gdbm over bdb, so we will too.
# hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+ local hcaches=(
+ "tokyocabinet"
+ "qdbm"
+ "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="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+ myconf+=( "--disable-hcache" )
fi
+ for hcache in "${hcaches[@]}" ; do
+ [[ ${hcache} == ${ucache} ]] \
+ && myconf+=( "--with-${hcache#*:}" ) \
+ || myconf+=( "--without-${hcache#*:}" )
+ done
# there's no need for gnutls, ssl or sasl without socket support
if use pop || use imap || use smtp ; then
if use gnutls; then
- myconf="${myconf} --with-gnutls"
+ myconf+=( "--with-gnutls" )
elif use ssl; then
- myconf="${myconf} --with-ssl"
+ myconf+=( "--with-ssl" )
fi
# not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
+ myconf+=( "$(use_with sasl)" )
else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+ myconf+=(
+ "--without-gnutls"
+ "--without-ssl"
+ "--without-sasl"
+ )
fi
if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+ myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
else
- myconf="${myconf} --with-homespool=Maildir"
+ myconf+=( "--with-homespool=Maildir" )
fi
- econf ${myconf} || die "configure failed"
+ econf "${myconf[@]}" || die "configure failed"
}
src_install() {
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-13 16:06 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-13 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 63320c78b3c8b22c91b93eea90c9769886225a96
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 16:05:32 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63320c78
mail-client/mutt: use slot operator for sys-libs/db
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.7.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.1-r1.ebuild b/mail-client/mutt/mutt-1.7.1-r1.ebuild
index 27fe71b..76ca7ff 100644
--- a/mail-client/mutt/mutt-1.7.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r1.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
qdbm? ( dev-db/qdbm )
!qdbm? (
gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
)
)
imap? (
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-10-19 16:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-10-19 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 408bb68607041075cd92014ed8e8195367a36a04
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 16:15:26 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 16:15:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=408bb686
mail-client/mutt: revbump 1.7.1 with latest patches
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.1-r1.ebuild => mutt-1.7.1-r2.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index ff7c8bd..9ea7f53 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.1-patches-r1.tar.xz 151368 SHA256 f70d1cd72fbba24b0ab18fcd60a43c61c416b17185c740f97f7a8c3dda182acc SHA512 3ba00cccea6029986db2c75343a86ed6a1da8e55c4066c7a99a54a8612c1e5d8512e5d58e49be9d6721c8a989775042415ec49055680ac120d267a304bf41f4c WHIRLPOOL c120f0108d6323e4d1b1597f3a491c2c842825aabf3ac876ab2c7d5c8360a8465ec46eea1b1a5953a28fcf91439971c053e4b806e3dbdf34d5a966f827944ff2
+DIST mutt-gentoo-1.7.1-patches-r2.tar.xz 152444 SHA256 2c4475778393a0905b487d84b5fd70376afd172010fabb2086b19ff8d0bd5343 SHA512 f8f455ebc6385875256724b5def6751223fc6752e9e45eb786fa4911017aae50a77f2a2d65dd33c79be7e1e418917faf5b941af1080732987c8a30069786134f WHIRLPOOL 5d747de0718dda57da9c7d85ac7351d73df9fd51d55ac022882c4927357a7ec190ee0235b4e9c1b483a86ec18bf77c974fd2a3cc7f2f20b32d9fc65cda6d6b71
diff --git a/mail-client/mutt/mutt-1.7.1-r1.ebuild b/mail-client/mutt/mutt-1.7.1-r2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.1-r1.ebuild
rename to mail-client/mutt/mutt-1.7.1-r2.ebuild
index 76ca7ff..6dca570 100644
--- a/mail-client/mutt/mutt-1.7.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r2"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-11-04 20:35 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-11-04 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 6af6f8227f3e68d0ad49cea203492a01e28c29b5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 20:35:30 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 20:35:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af6f822
mail-client/mutt: revbump with latest upstream patches
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 2 +-
.../mutt/{mutt-1.7.1-r2.ebuild => mutt-1.7.1-r3.ebuild} | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 9ea7f53..78d938b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.1-patches-r2.tar.xz 152444 SHA256 2c4475778393a0905b487d84b5fd70376afd172010fabb2086b19ff8d0bd5343 SHA512 f8f455ebc6385875256724b5def6751223fc6752e9e45eb786fa4911017aae50a77f2a2d65dd33c79be7e1e418917faf5b941af1080732987c8a30069786134f WHIRLPOOL 5d747de0718dda57da9c7d85ac7351d73df9fd51d55ac022882c4927357a7ec190ee0235b4e9c1b483a86ec18bf77c974fd2a3cc7f2f20b32d9fc65cda6d6b71
+DIST mutt-gentoo-1.7.1-patches-r3.tar.xz 154292 SHA256 0f00b28c348af09900228a867d38b6b0c9496717657a67776e6dcaaa4299e33b SHA512 7017687c6c71387265f49a6f65b84b402baf8c980f6e6af3b2bb7ba7cb57e2d06bf9320415d93131c49ab6228722ba3b6244579435204dc7c0872eed6d5713fe WHIRLPOOL 88d22145c2cdfa483741d04d3c83986419eb0a6edfcee7ac0e0365fe65977cfa06d62154b91d85e7bb8e16c22c8f1d38ebfa1dfd2a05ca0ba426e3cdc4ff1696
diff --git a/mail-client/mutt/mutt-1.7.1-r2.ebuild b/mail-client/mutt/mutt-1.7.1-r3.ebuild
similarity index 96%
rename from mail-client/mutt/mutt-1.7.1-r2.ebuild
rename to mail-client/mutt/mutt-1.7.1-r3.ebuild
index 6dca570..efe9616 100644
--- a/mail-client/mutt/mutt-1.7.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r3.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r2"
+PATCHREV="r3"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
@@ -114,7 +114,9 @@ src_prepare() {
eapply_user && upatches=" with user patches"
# patch version string for bug reports
- sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s, '"${PATCHSET}${upatches}"')"|' \
+ 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
@@ -124,17 +126,13 @@ src_prepare() {
# the dotlock program, resulting in bugs like #278332
sed -i -e 's/@DOTLOCK_GROUP@//' \
Makefile.in || die "sed failed"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
}
src_configure() {
local myconf=(
"$(use_enable crypt pgp)"
"$(use_enable debug)"
+ "$(use_enable doc)"
"$(use_enable gpg gpgme)"
"$(use_enable imap)"
"$(use_enable nls)"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-11-17 20:38 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-11-17 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 87f40656db2dd74964eae316c1d83d562f43c79b
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 20:33:07 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 20:35:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f40656
mail-client/mutt: revbump with latest upstream patches, updated neomutt nntp, notmuch, added gpg-encrypt-to-self
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.7.1-r3.ebuild => mutt-1.7.1-r4.ebuild} | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 78d938b..b7bfc83 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.1-patches-r3.tar.xz 154292 SHA256 0f00b28c348af09900228a867d38b6b0c9496717657a67776e6dcaaa4299e33b SHA512 7017687c6c71387265f49a6f65b84b402baf8c980f6e6af3b2bb7ba7cb57e2d06bf9320415d93131c49ab6228722ba3b6244579435204dc7c0872eed6d5713fe WHIRLPOOL 88d22145c2cdfa483741d04d3c83986419eb0a6edfcee7ac0e0365fe65977cfa06d62154b91d85e7bb8e16c22c8f1d38ebfa1dfd2a05ca0ba426e3cdc4ff1696
+DIST mutt-gentoo-1.7.1-patches-r4.tar.xz 144620 SHA256 553d678cd671c66873a3ac822895c0a19e872b764dd62e374d5d1f68a9889e05 SHA512 12a66340e6c6512689a5e39acb490bdaaca411b84aec2d2a7feaa4301474ee56f55e27a476c7c14de060f72671477ac129e2817938d53da71162cc55667b215e WHIRLPOOL dcc12f658babfb398f518000f8b8195d0f2fce090914490bccba2d813eb1f5fd7bd5d4b26fe6c9480b20a4778478695072eeb174534e31ee729e77fe821b2e2e
diff --git a/mail-client/mutt/mutt-1.7.1-r3.ebuild b/mail-client/mutt/mutt-1.7.1-r4.ebuild
similarity index 96%
rename from mail-client/mutt/mutt-1.7.1-r3.ebuild
rename to mail-client/mutt/mutt-1.7.1-r4.ebuild
index efe9616..0ef1837 100644
--- a/mail-client/mutt/mutt-1.7.1-r3.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r4.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r3"
+PATCHREV="r4"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
@@ -105,8 +105,8 @@ src_prepare() {
done
# add some explanation as to why not to go upstream
sed -i \
- -e '/ReachingUs = N_(/a\"This 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"' \
- version.c || die "Failed to add bug instructions"
+ -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=
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-11-27 21:04 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-11-27 21:04 UTC (permalink / raw
To: gentoo-commits
commit: b674ebd71fa887d69a487f39771e9a6d284ba6af
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 21:03:54 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 21:03:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b674ebd7
mail-client/mutt: restrict gpgme to a compile-time compatible version, bug #600600
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.5.23-r7.ebuild | 2 +-
mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index 5916079..b0b3737 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -47,7 +47,7 @@ CDEPEND="
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
+ gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.8.0 )
smime? ( >=dev-libs/openssl-0.9.6 )
slang? ( sys-libs/slang )
!slang? ( >=sys-libs/ncurses-5.2 )
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index e2ed809..7114412 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -62,7 +62,7 @@ CDEPEND="
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
+ gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.8.0 )
smime? (
!libressl? ( >=dev-libs/openssl-0.9.6:0 )
libressl? ( dev-libs/libressl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-11-27 21:04 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-11-27 21:04 UTC (permalink / raw
To: gentoo-commits
commit: a25d5f95399edb251e863a9b59965c73839e6b81
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 20:56:37 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 20:56:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25d5f95
mail-client/mutt: revbump for latest patches including fix for bug #600600
Package-Manager: portage-2.3.0
mail-client/mutt/{mutt-1.7.1-r4.ebuild => mutt-1.7.1-r5.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/mail-client/mutt/mutt-1.7.1-r4.ebuild b/mail-client/mutt/mutt-1.7.1-r5.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.7.1-r4.ebuild
rename to mail-client/mutt/mutt-1.7.1-r5.ebuild
^ permalink raw reply [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-11-28 6:43 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-11-28 6:43 UTC (permalink / raw
To: gentoo-commits
commit: 4508d4443367c54a2b1e4d6e941aefd8c1130840
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 06:43:02 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 06:43:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4508d444
mail-client/mutt: bump patchset to enable gpgme fix
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.7.1-r5.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b7bfc83..7199bae 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.1-patches-r4.tar.xz 144620 SHA256 553d678cd671c66873a3ac822895c0a19e872b764dd62e374d5d1f68a9889e05 SHA512 12a66340e6c6512689a5e39acb490bdaaca411b84aec2d2a7feaa4301474ee56f55e27a476c7c14de060f72671477ac129e2817938d53da71162cc55667b215e WHIRLPOOL dcc12f658babfb398f518000f8b8195d0f2fce090914490bccba2d813eb1f5fd7bd5d4b26fe6c9480b20a4778478695072eeb174534e31ee729e77fe821b2e2e
+DIST mutt-gentoo-1.7.1-patches-r5.tar.xz 146724 SHA256 1f6350a1e8a6b4e86085c1e492cfba0a0f9a1c7e8441aacd4a3a53ec75b309c6 SHA512 80c9129bccd533471defa36eb4b697bd082effdc66e464da432cf0636e82b77c0bcdd9b7d5421fa7c4c892a0ae2a12b0ba0458e7147a3dc84369ffdfb2ae1c97 WHIRLPOOL e04f147faedd6c80836cb954e719f8a8f37dbdc11127511dbe9756cb18097002f2c43960806fd67ac9bd322eccffac3823984ac728499f5c150aec0737f48ca3
diff --git a/mail-client/mutt/mutt-1.7.1-r5.ebuild b/mail-client/mutt/mutt-1.7.1-r5.ebuild
index 0ef1837..ac4573b 100644
--- a/mail-client/mutt/mutt-1.7.1-r5.ebuild
+++ b/mail-client/mutt/mutt-1.7.1-r5.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r4"
+PATCHREV="r5"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-05 9:10 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-12-05 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 667c195fda395bb9c6f8775b182869b57ea74f5d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 09:09:25 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 09:10:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667c195f
mail-client/mutt: version bump to 1.7.2
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.7.1-r5.ebuild => mutt-1.7.2.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 7199bae..4120872 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,5 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc8
DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.1-patches-r5.tar.xz 146724 SHA256 1f6350a1e8a6b4e86085c1e492cfba0a0f9a1c7e8441aacd4a3a53ec75b309c6 SHA512 80c9129bccd533471defa36eb4b697bd082effdc66e464da432cf0636e82b77c0bcdd9b7d5421fa7c4c892a0ae2a12b0ba0458e7147a3dc84369ffdfb2ae1c97 WHIRLPOOL e04f147faedd6c80836cb954e719f8a8f37dbdc11127511dbe9756cb18097002f2c43960806fd67ac9bd322eccffac3823984ac728499f5c150aec0737f48ca3
+DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
+DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
diff --git a/mail-client/mutt/mutt-1.7.1-r5.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.7.1-r5.ebuild
rename to mail-client/mutt/mutt-1.7.2.ebuild
index ac4573b..e2decc3 100644
--- a/mail-client/mutt/mutt-1.7.1-r5.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r5"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-07 6:42 Jason Zaman
0 siblings, 0 replies; 249+ messages in thread
From: Jason Zaman @ 2016-12-07 6:42 UTC (permalink / raw
To: gentoo-commits
commit: c8f649f8d0bee44e467897313a2b00a263ad0042
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 05:39:26 2016 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 05:39:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8f649f8
mail-client/mutt: add subslot deps for ncurses and ssl
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.5.23-r7.ebuild | 18 +++++++++---------
mail-client/mutt/mutt-1.5.24-r2.ebuild | 26 +++++++++++++-------------
mail-client/mutt/mutt-1.7.2.ebuild | 28 ++++++++++++++--------------
3 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index b0b3737..7bc5fa4 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -27,30 +27,30 @@ CDEPEND="
qdbm? ( dev-db/qdbm )
!qdbm? (
gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
)
)
imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6:= ) )
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
kerberos? ( virtual/krb5 )
pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6:= ) )
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6:= ) )
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
idn? ( net-dns/libidn )
gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.8.0 )
- smime? ( >=dev-libs/openssl-0.9.6 )
+ smime? ( >=dev-libs/openssl-0.9.6:0= )
slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2 )
+ !slang? ( >=sys-libs/ncurses-5.2:0= )
"
DEPEND="${CDEPEND}
net-mail/mailbase
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index 7114412..ac1116b 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -27,36 +27,36 @@ CDEPEND="
qdbm? ( dev-db/qdbm )
!qdbm? (
gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
)
)
imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
!gnutls? (
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
)
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
kerberos? ( virtual/krb5 )
pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
!gnutls? (
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
)
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
!gnutls? (
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
)
sasl? ( >=dev-libs/cyrus-sasl-2 )
@@ -64,11 +64,11 @@ CDEPEND="
idn? ( net-dns/libidn )
gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.8.0 )
smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2:0 )
+ !slang? ( >=sys-libs/ncurses-5.2:0= )
"
DEPEND="${CDEPEND}
net-mail/mailbase
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index e2decc3..6de5231 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -31,45 +31,45 @@ CDEPEND="
)
)
imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
!gnutls? (
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
)
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
kerberos? ( virtual/krb5 )
pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
!gnutls? (
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
)
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
!gnutls? (
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
)
sasl? ( >=dev-libs/cyrus-sasl-2 )
)
idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 )
+ gpg? ( >=app-crypt/gpgme-0.9.0:= )
smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
)
- notmuch? ( net-mail/notmuch )
+ notmuch? ( net-mail/notmuch:= )
slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2:0 )
+ !slang? ( >=sys-libs/ncurses-5.2:0= )
"
DEPEND="${CDEPEND}
net-mail/mailbase
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-07 18:51 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-12-07 18:51 UTC (permalink / raw
To: gentoo-commits
commit: ee233866cb4daf17913d7671f0cdf4bca3a58834
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 18:50:47 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 18:51:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee233866
mail-client/mutt: add back keywords after masking USE=notmuch, bug #587560
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index 6de5231..911eaa9 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-07 18:57 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-12-07 18:57 UTC (permalink / raw
To: gentoo-commits
commit: a580532cbea4244bae520dff785055b9d0e72485
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 18:56:47 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 18:56:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a580532c
mail-client/mutt: add back ~x86-fbsd keyword after masking USE=notmuch, bug #587560
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index 911eaa9..06cd0b2 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-11 12:50 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2016-12-11 12:50 UTC (permalink / raw
To: gentoo-commits
commit: f4aa2e15cfae2aa2fa4042cb2765a85b950ffd9f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 12:50:03 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 12:50:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4aa2e15
mail-client/mutt: add back stable keyword for x86, bug #572342
Package-Manager: portage-2.3.0
mail-client/mutt/mutt-1.5.23-r7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index 7bc5fa4..1e388bb 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="ia64 sparc" # last stable
+KEYWORDS="ia64 sparc x86" # last stable
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-21 21:34 Thomas Deutschmann
0 siblings, 0 replies; 249+ messages in thread
From: Thomas Deutschmann @ 2016-12-21 21:34 UTC (permalink / raw
To: gentoo-commits
commit: 2031567a967dc7c23a82813f6999fb0d960826f2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 20:57:19 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 21:33:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2031567a
mail-client/mutt: x86 stable (bug #572342)
Package-Manager: Portage-2.3.2, Repoman-2.3.1
mail-client/mutt/mutt-1.5.24-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index ac1116b..bdbe44d 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2016-12-31 17:54 Mikle Kolyada
0 siblings, 0 replies; 249+ messages in thread
From: Mikle Kolyada @ 2016-12-31 17:54 UTC (permalink / raw
To: gentoo-commits
commit: c52e6c54339f30709e0d6dc6feeb581ef9cf654f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 12:43:28 2016 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 17:54:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52e6c54
mail-client/mutt: Improve smime description
Package-Manager: portage-2.3.0
mail-client/mutt/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 480b414..de2759e 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -13,7 +13,7 @@
<flag name="pop">Enable support for POP3</flag>
<flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
<flag name="sidebar">Enable the sidebar feature</flag>
- <flag name="smime">Enable support for smime</flag>
+ <flag name="smime">Enable support for S/MIME</flag>
<flag name="smtp">Enable support for smtp</flag>
<flag name="tokyocabinet">Enable tokyocabinet database backend for header
caching</flag>
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-01-04 19:52 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-01-04 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 0f4cc747611c23e6836e1723d0ab4fef44e5b781
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 19:52:05 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 19:52:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4cc747
mail-client/mutt: revbump 1.7.2 for latest features/fixes from upstream
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 1 +
mail-client/mutt/mutt-1.7.2-r1.ebuild | 275 ++++++++++++++++++++++++++++++++++
2 files changed, 276 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 4120872..b1574cc 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,3 +4,4 @@ DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
+DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
diff --git a/mail-client/mutt/mutt-1.7.2-r1.ebuild b/mail-client/mutt/mutt-1.7.2-r1.ebuild
new file mode 100644
index 00000000..1cd043a
--- /dev/null
+++ b/mail-client/mutt/mutt-1.7.2-r1.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+ app-misc/mime-types
+ nls? ( virtual/libintl )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ !tokyocabinet? (
+ qdbm? ( dev-db/qdbm )
+ !qdbm? (
+ gdbm? ( sys-libs/gdbm )
+ !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
+ )
+ )
+ imap? (
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ pop? (
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ smtp? (
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? (
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
+ idn? ( net-dns/libidn )
+ gpg? ( >=app-crypt/gpgme-0.9.0:= )
+ smime? (
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ 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}"/gentoo-mutt-${PV}-patches
+
+ if use !vanilla ; then
+ # apply patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ local patches=(
+ patches-mutt
+ bugs-gentoo
+ features-common
+ features-extra
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ 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 debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable imap)"
+ "$(use_enable nls)"
+ "$(use_enable nntp)"
+ "$(use_enable pop)"
+ "$(use_enable sidebar)"
+ "$(use_enable smime)"
+ "$(use_enable smtp)"
+ "$(use_enable notmuch)"
+ "$(use_with idn)"
+ "$(use_with kerberos gss)"
+ "--with-$(use slang && echo slang || echo 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
+
+ # mutt prioritizes gdbm over bdb, so we will too.
+ # hcache feature requires at least one database is in USE.
+ local hcaches=(
+ "tokyocabinet"
+ "qdbm"
+ "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
+
+ # there's no need for gnutls, ssl or sasl without socket support
+ if use pop || use imap || use smtp ; then
+ if use gnutls; then
+ myconf+=( "--with-gnutls" )
+ elif use ssl; then
+ myconf+=( "--with-ssl" )
+ fi
+ # not sure if this should be mutually exclusive with the other two
+ myconf+=( "$(use_with sasl)" )
+ else
+ myconf+=(
+ "--without-gnutls"
+ "--without-ssl"
+ "--without-sasl"
+ )
+ fi
+
+ 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 /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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-01-25 13:53 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-01-25 13:53 UTC (permalink / raw
To: gentoo-commits
commit: a3e5d630edada96d9a128b9c50daf5c710fa3a50
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 13:53:12 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 13:53:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e5d630
mail-client/mutt: revbump with latest features/fixes, added lmdb support
Package-Manager: portage-2.3.0
mail-client/mutt/Manifest | 1 +
mail-client/mutt/metadata.xml | 9 +-
mail-client/mutt/mutt-1.7.2-r2.ebuild | 246 ++++++++++++++++++++++++++++++++++
3 files changed, 253 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b1574cc..84663e0 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,3 +5,4 @@ DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
+DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index de2759e..0e7f081 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -9,14 +9,17 @@
<name>Net-Mail</name>
</maintainer>
<use>
+ <flag name="hcache">Enable header cache</flag>
<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
<flag name="pop">Enable support for POP3</flag>
- <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></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="sidebar">Enable the sidebar feature</flag>
<flag name="smime">Enable support for S/MIME</flag>
<flag name="smtp">Enable support for smtp</flag>
- <flag name="tokyocabinet">Enable tokyocabinet database backend for header
- caching</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>
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild
new file mode 100644
index 00000000..6669d59
--- /dev/null
+++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r3"
+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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+REQUIRED_USE="
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ^^ ( ssl gnutls libressl ) )
+ pop? ( ^^ ( ssl gnutls libressl ) )
+ nntp? ( ^^ ( ssl gnutls libressl ) )
+ smime? ( ^^ ( ssl libressl ) )
+ smtp? ( ^^ ( ssl gnutls libressl ) )
+ sasl? ( || ( imap pop smtp nntp ) )
+ kerberos? ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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 )
+
+ gnutls? ( >=net-libs/gnutls-1.0.17:= )
+ libressl? ( dev-libs/libressl:= )
+ ssl? ( >=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:= )
+ 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}"/gentoo-mutt-${PV}-patches
+
+ if use !vanilla ; then
+ # apply patches
+ export EPATCH_FORCE="yes"
+ export EPATCH_SUFFIX="patch"
+ local patches=(
+ patches-mutt
+ bugs-gentoo
+ features-common
+ features-extra
+ gentoo
+ )
+ local patchset
+ for patchset in "${patches[@]}" ; do
+ 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 debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable notmuch)"
+ "$(use_enable sidebar)"
+ "$(use_enable smime)"
+
+ "$(use_enable imap)"
+ "$(use_enable pop)"
+ "$(use_enable nntp)"
+ "$(use_enable smtp)"
+
+ "$(use_with gnutls)"
+ "$(use libressl || use ssl && echo --with-ssl)"
+ "$(use !libressl && use !ssl && echo --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 /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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-02-02 15:44 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-02-02 15:44 UTC (permalink / raw
To: gentoo-commits
commit: cabe45dd2022018d042102ad38cd074bb980f3ec
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 15:44:07 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 15:44:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cabe45dd
mail-client/mutt: turn USE=ssl into generic ssl selector, thanks Hendrik v. Raven for the initial patch in bug #607826
Package-Manager: portage-2.3.3
mail-client/mutt/mutt-1.7.2-r2.ebuild | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild
index 6b3f972..5dd4514 100644
--- a/mail-client/mutt/mutt-1.7.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild
@@ -18,11 +18,11 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
REQUIRED_USE="
hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
- imap? ( ^^ ( ssl gnutls libressl ) )
- pop? ( ^^ ( ssl gnutls libressl ) )
- nntp? ( ^^ ( ssl gnutls libressl ) )
- smime? ( ^^ ( ssl libressl ) )
- smtp? ( ^^ ( ssl gnutls libressl ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ nntp? ( ssl )
+ smime? ( ssl !gnutls )
+ smtp? ( ssl )
sasl? ( || ( imap pop smtp nntp ) )
kerberos? ( || ( imap pop smtp nntp ) )"
SLOT="0"
@@ -37,9 +37,13 @@ CDEPEND="
qdbm? ( dev-db/qdbm )
tokyocabinet? ( dev-db/tokyocabinet )
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- libressl? ( dev-libs/libressl:= )
- ssl? ( >=dev-libs/openssl-0.9.6:0= )
+ 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 )
@@ -123,9 +127,9 @@ src_configure() {
"$(use_enable nntp)"
"$(use_enable smtp)"
- "$(use_with gnutls)"
- "$(use libressl || use ssl && echo --with-ssl)"
- "$(use !libressl && use !ssl && echo --without-ssl)"
+ $(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)"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-02-03 20:19 Jeroen Roovers
0 siblings, 0 replies; 249+ messages in thread
From: Jeroen Roovers @ 2017-02-03 20:19 UTC (permalink / raw
To: gentoo-commits
commit: a812d4dff226435a42d9045441769a61bf2e2b6c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 20:19:01 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 20:19:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a812d4df
mail-client/mutt: Mark ~hppa (bug #587560).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches
mail-client/mutt/mutt-1.7.2-r1.ebuild | 2 +-
mail-client/mutt/mutt-1.7.2-r2.ebuild | 2 +-
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/mutt-1.7.2-r1.ebuild b/mail-client/mutt/mutt-1.7.2-r1.ebuild
index 9eeda44..dfbc734 100644
--- a/mail-client/mutt/mutt-1.7.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.7.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+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
nls? ( virtual/libintl )
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild
index 5dd4514..7abf20e 100644
--- a/mail-client/mutt/mutt-1.7.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp nntp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+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
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index b0d2430..249f840 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-02-03 22:18 Jeroen Roovers
0 siblings, 0 replies; 249+ messages in thread
From: Jeroen Roovers @ 2017-02-03 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 23e366009d47658848a706f1139ccaf2d3ec10e6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 22:17:41 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 22:17:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e36600
mail-client/mutt: Stable for HPPA (bug #604902).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index 249f840..f979c85 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-02-16 23:14 Michael Weber
0 siblings, 0 replies; 249+ messages in thread
From: Michael Weber @ 2017-02-16 23:14 UTC (permalink / raw
To: gentoo-commits
commit: 06d976ed3cc4c2d810404c5c4a6e37789195395d
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 23:12:52 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 23:12:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d976ed
mail-client/mutt: ppc64 stable (bug 604902).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index f979c85ef2..829d8822c8 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-02-25 20:04 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-02-25 20:04 UTC (permalink / raw
To: gentoo-commits
commit: f92f01770bf963e04ded937930afacc762f8f6b3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 19:58:06 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 20:04:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92f0177
mail-client/mutt: version bump to 1.8.0
Package-Manager: Portage-2.3.2-prefix, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.8.0.ebuild | 250 +++++++++++++++++++++++++++++++++++++
2 files changed, 252 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 84663e0e3f..26401d7464 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,6 +3,8 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
+DIST mutt-1.8.0.tar.gz 4116223 SHA256 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab SHA512 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d WHIRLPOOL 5a47aa961a3172b8ff731ce2ad19eb6cece6f31fc18cad8bb6cba821670a3a5c17196447c2711bc7be9f40826c8d6b25c3081bd0b8366f1921487f05c5ca641b
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
+DIST mutt-gentoo-1.8.0-patches-r0.tar.xz 111704 SHA256 7b24b214a2b4f091182ae21cc70d07c034abe9951361c7a4625c8633fc04ca4a SHA512 3532984efd0c335edca53e0082ccf9202d95d5f37896d47828ff764d3757f449bfaac401b6dc6fa9c8f1bdf4e32e839de07853cbeb7e5ed66f515db14d4041c7 WHIRLPOOL a0e48d7d61e25b440278f4b240475347b534c709ee97061fcacb41bc52715c60bf90503139d1cdcae40d209b80228bde91ced18cf492f2575c1a116d836840bd
diff --git a/mail-client/mutt/mutt-1.8.0.ebuild b/mail-client/mutt/mutt-1.8.0.ebuild
new file mode 100644
index 0000000000..777f7c1f12
--- /dev/null
+++ b/mail-client/mutt/mutt-1.8.0.ebuild
@@ -0,0 +1,250 @@
+# 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="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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+REQUIRED_USE="
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ nntp? ( ssl )
+ smime? ( 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:= )
+ 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"
+ 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 debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable notmuch)"
+ "$(use_enable sidebar)"
+ "$(use_enable 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 /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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-02-28 13:16 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-02-28 13:16 UTC (permalink / raw
To: gentoo-commits
commit: b8103a98d94635b79a8e5d1c52633b32621bb4b0
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 13:15:37 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 13:16:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8103a98
mail-client/mutt: add links to used sources for code and patches
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/mutt-1.7.2-r2.ebuild | 2 ++
mail-client/mutt/mutt-1.8.0.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild
index 7abf20e856..8c789cc18d 100644
--- a/mail-client/mutt/mutt-1.7.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2-r2.ebuild
@@ -73,6 +73,8 @@ src_prepare() {
# apply patches
export EPATCH_FORCE="yes"
export EPATCH_SUFFIX="patch"
+ # http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.7
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.7
local patches=(
patches-mutt
bugs-gentoo
diff --git a/mail-client/mutt/mutt-1.8.0.ebuild b/mail-client/mutt/mutt-1.8.0.ebuild
index 777f7c1f12..ef287d76cc 100644
--- a/mail-client/mutt/mutt-1.8.0.ebuild
+++ b/mail-client/mutt/mutt-1.8.0.ebuild
@@ -72,6 +72,8 @@ src_prepare() {
# 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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-03-10 14:26 Michael Weber
0 siblings, 0 replies; 249+ messages in thread
From: Michael Weber @ 2017-03-10 14:26 UTC (permalink / raw
To: gentoo-commits
commit: be42bde5ca587ba750e5c47ea742ee2338c26582
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 14:20:32 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 14:20:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be42bde5
mail-client/mutt: arm ppc stable (bug 604902).
Package-Manager: Portage-2.3.4, Repoman-2.3.2
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index 2d77bfabce9..848adca88b6 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-03-26 15:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-03-26 15:05 UTC (permalink / raw
To: gentoo-commits
commit: c430432bac4bd55a5f85986e22ec2d6c0b109f3c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 15:04:38 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 15:05:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c430432b
mail-client/mutt: revbump to 1.8.0-r1 for latest patches and fixes including bug #611026
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.8.0.ebuild => mutt-1.8.0-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 26401d7464e..0a1f52dd6ff 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-1.8.0.tar.gz 4116223 SHA256 45841eda12804b460260adff8f3f39cc977744e832
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
-DIST mutt-gentoo-1.8.0-patches-r0.tar.xz 111704 SHA256 7b24b214a2b4f091182ae21cc70d07c034abe9951361c7a4625c8633fc04ca4a SHA512 3532984efd0c335edca53e0082ccf9202d95d5f37896d47828ff764d3757f449bfaac401b6dc6fa9c8f1bdf4e32e839de07853cbeb7e5ed66f515db14d4041c7 WHIRLPOOL a0e48d7d61e25b440278f4b240475347b534c709ee97061fcacb41bc52715c60bf90503139d1cdcae40d209b80228bde91ced18cf492f2575c1a116d836840bd
+DIST mutt-gentoo-1.8.0-patches-r1.tar.xz 116584 SHA256 73d23e90b8486d41ee2734d0734e7176bc78945d10f2eb8593923e6739115459 SHA512 8ddb181d6a2d31e128106769b330eec140e1305271bd6d316dd0a8b1cf7a4b339430a4d948711d1470251d1d3804239cbbfa36521b9b6e187d378d87e92d5c9a WHIRLPOOL 2417c7ff86987a027a256ac6e19bd90ad1cd2e0f2ab094208f61304779e3497a35ec4c6ed01cec20312bfd0075691d9d9b9699d91a74640d97047b01b6cf9508
diff --git a/mail-client/mutt/mutt-1.8.0.ebuild b/mail-client/mutt/mutt-1.8.0-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.8.0.ebuild
rename to mail-client/mutt/mutt-1.8.0-r1.ebuild
index ef287d76cc0..25977fd875d 100644
--- a/mail-client/mutt/mutt-1.8.0.ebuild
+++ b/mail-client/mutt/mutt-1.8.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-04-13 17:34 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-04-13 17:34 UTC (permalink / raw
To: gentoo-commits
commit: df11a4cabe5da5eeda1b0dfff2be2465375fa912
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 17:34:14 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 17:34:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df11a4ca
mail-client/mutt: version bump to 1.8.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.8.1.ebuild | 252 +++++++++++++++++++++++++++++++++++++
2 files changed, 254 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 0a1f52dd6ff..8528aeed359 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,7 +4,9 @@ DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
DIST mutt-1.8.0.tar.gz 4116223 SHA256 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab SHA512 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d WHIRLPOOL 5a47aa961a3172b8ff731ce2ad19eb6cece6f31fc18cad8bb6cba821670a3a5c17196447c2711bc7be9f40826c8d6b25c3081bd0b8366f1921487f05c5ca641b
+DIST mutt-1.8.1.tar.gz 4118443 SHA256 0be55a8cae6db2ef7ce831a70cbf6b2d8a0de558a08814933a67855ef07b0dad SHA512 5d695212560266aa16f2a547305bc6cd1a1ee7b10bfac9c45b5a8f7b5dfc16b8c288f5229bdf38167a77c44952bf353d93def5b928001ec4982e018f8c1a3e7a WHIRLPOOL b99615eb4485e26f60ce3eb5fe5201fc0c3d7bbd5067a4001209e9f746b09596016df9a28dab28913945f54c0b4a17cc869b47cb72726d1a377bdf9c18c89c69
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
DIST mutt-gentoo-1.8.0-patches-r1.tar.xz 116584 SHA256 73d23e90b8486d41ee2734d0734e7176bc78945d10f2eb8593923e6739115459 SHA512 8ddb181d6a2d31e128106769b330eec140e1305271bd6d316dd0a8b1cf7a4b339430a4d948711d1470251d1d3804239cbbfa36521b9b6e187d378d87e92d5c9a WHIRLPOOL 2417c7ff86987a027a256ac6e19bd90ad1cd2e0f2ab094208f61304779e3497a35ec4c6ed01cec20312bfd0075691d9d9b9699d91a74640d97047b01b6cf9508
+DIST mutt-gentoo-1.8.1-patches-r0.tar.xz 133328 SHA256 0790e607db777f910206929f54234ee533e03905a82aa4c8afb9009ae0c7c165 SHA512 90e3d00f9496fd394ccb43c3f50f0593c3b4167e7cdf0ceb75a4d84c5c4851032b79453df1259af70e1cfa716f96636e484b08215aa029ec9cc7a22797a1f086 WHIRLPOOL bf64b16bcbcc7a61de54e363ac8aa014ba10fc46481b6304312175d15afc3aa7c8d1ad131e1fdac2ef660a5f701985d36939e93208b54adedc2919532e57da4a
diff --git a/mail-client/mutt/mutt-1.8.1.ebuild b/mail-client/mutt/mutt-1.8.1.ebuild
new file mode 100644
index 00000000000..ef287d76cc0
--- /dev/null
+++ b/mail-client/mutt/mutt-1.8.1.ebuild
@@ -0,0 +1,252 @@
+# 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="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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+REQUIRED_USE="
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ nntp? ( ssl )
+ smime? ( 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:= )
+ 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 debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable notmuch)"
+ "$(use_enable sidebar)"
+ "$(use_enable 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 /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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-04-19 12:07 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-04-19 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 09420cef2d9bbbcde9b9914e4281e7a1d2d4fc6f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 12:06:30 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 12:06:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09420cef
mail-client/mutt: version bump to 1.8.2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.8.1.ebuild => mutt-1.8.2.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8528aeed359..bfdb76bee02 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,9 +4,9 @@ DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
DIST mutt-1.8.0.tar.gz 4116223 SHA256 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab SHA512 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d WHIRLPOOL 5a47aa961a3172b8ff731ce2ad19eb6cece6f31fc18cad8bb6cba821670a3a5c17196447c2711bc7be9f40826c8d6b25c3081bd0b8366f1921487f05c5ca641b
-DIST mutt-1.8.1.tar.gz 4118443 SHA256 0be55a8cae6db2ef7ce831a70cbf6b2d8a0de558a08814933a67855ef07b0dad SHA512 5d695212560266aa16f2a547305bc6cd1a1ee7b10bfac9c45b5a8f7b5dfc16b8c288f5229bdf38167a77c44952bf353d93def5b928001ec4982e018f8c1a3e7a WHIRLPOOL b99615eb4485e26f60ce3eb5fe5201fc0c3d7bbd5067a4001209e9f746b09596016df9a28dab28913945f54c0b4a17cc869b47cb72726d1a377bdf9c18c89c69
+DIST mutt-1.8.2.tar.gz 4118429 SHA256 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 SHA512 a5db6154c6baf96e64e9b55b866052b1dae96166b9993fd9a55dc9801a525b50539d26b68d04983f70e9cc1927d95b5b9057f153ce579398e711a24bbd04869c WHIRLPOOL 338728bd97c1bad36b71fb187b2bd91b517f987049aef7ead0cb8baaefc5b2828991590569980e97b8228fe870cf77439ab01577e3c6dcc10684858be9f1a64c
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
DIST mutt-gentoo-1.8.0-patches-r1.tar.xz 116584 SHA256 73d23e90b8486d41ee2734d0734e7176bc78945d10f2eb8593923e6739115459 SHA512 8ddb181d6a2d31e128106769b330eec140e1305271bd6d316dd0a8b1cf7a4b339430a4d948711d1470251d1d3804239cbbfa36521b9b6e187d378d87e92d5c9a WHIRLPOOL 2417c7ff86987a027a256ac6e19bd90ad1cd2e0f2ab094208f61304779e3497a35ec4c6ed01cec20312bfd0075691d9d9b9699d91a74640d97047b01b6cf9508
-DIST mutt-gentoo-1.8.1-patches-r0.tar.xz 133328 SHA256 0790e607db777f910206929f54234ee533e03905a82aa4c8afb9009ae0c7c165 SHA512 90e3d00f9496fd394ccb43c3f50f0593c3b4167e7cdf0ceb75a4d84c5c4851032b79453df1259af70e1cfa716f96636e484b08215aa029ec9cc7a22797a1f086 WHIRLPOOL bf64b16bcbcc7a61de54e363ac8aa014ba10fc46481b6304312175d15afc3aa7c8d1ad131e1fdac2ef660a5f701985d36939e93208b54adedc2919532e57da4a
+DIST mutt-gentoo-1.8.2-patches-r0.tar.xz 134820 SHA256 8a98b2d308c24429c9028b38bad9e9e7a7f3f28770c155d19013954fcbd30478 SHA512 18c10bccc76a2176b5f2ce64c20608eb9627911da34b1b6334d2a9e06b57444c5960f2bde7400b8208e4792b676110cd31e185dc7fd1eda7a28eb5964bd5d3f6 WHIRLPOOL 81b87bd94bcb13a542f0a0b497ba41daa83862dcaebda1d7e544286de71afdaf0d42bb186bf3747fe3f86fa9f1fbf2ac7b73ced0e815ed329324a47195b94b40
diff --git a/mail-client/mutt/mutt-1.8.1.ebuild b/mail-client/mutt/mutt-1.8.2.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.8.1.ebuild
rename to mail-client/mutt/mutt-1.8.2.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-04-19 19:44 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-04-19 19:44 UTC (permalink / raw
To: gentoo-commits
commit: 2e5073d93f05fac76537ffb4dfcd82185a589dc3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 19:43:56 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 19:44:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5073d9
mail-client/mutt: bump patchset for bug #615990
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.8.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index bfdb76bee02..a4e6f55e7f6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,4 +9,4 @@ DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cb
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
DIST mutt-gentoo-1.8.0-patches-r1.tar.xz 116584 SHA256 73d23e90b8486d41ee2734d0734e7176bc78945d10f2eb8593923e6739115459 SHA512 8ddb181d6a2d31e128106769b330eec140e1305271bd6d316dd0a8b1cf7a4b339430a4d948711d1470251d1d3804239cbbfa36521b9b6e187d378d87e92d5c9a WHIRLPOOL 2417c7ff86987a027a256ac6e19bd90ad1cd2e0f2ab094208f61304779e3497a35ec4c6ed01cec20312bfd0075691d9d9b9699d91a74640d97047b01b6cf9508
-DIST mutt-gentoo-1.8.2-patches-r0.tar.xz 134820 SHA256 8a98b2d308c24429c9028b38bad9e9e7a7f3f28770c155d19013954fcbd30478 SHA512 18c10bccc76a2176b5f2ce64c20608eb9627911da34b1b6334d2a9e06b57444c5960f2bde7400b8208e4792b676110cd31e185dc7fd1eda7a28eb5964bd5d3f6 WHIRLPOOL 81b87bd94bcb13a542f0a0b497ba41daa83862dcaebda1d7e544286de71afdaf0d42bb186bf3747fe3f86fa9f1fbf2ac7b73ced0e815ed329324a47195b94b40
+DIST mutt-gentoo-1.8.2-patches-r1.tar.xz 134744 SHA256 3fb154e1cf88e4da41bc51629f8b10379b0b1949a1335e578509efaac8a5afa1 SHA512 b4018e3d50adfbb9d5acefb6f6d26a30ebddee46bba0b7c1b7eeea1de5d2ac35909e5db958888f3e1d3f86b32b71eb338f52d508e1bf033dd9bb1a5cf670678c WHIRLPOOL 25d05fa5a833c59fd747950bb8e6b5194bab5eeb2a0cf1f308e8fc849d7866f957d5729fb7a39c43e85de36f90f3cc310aaf6956397a490eb72a9ff7ab5d1bcc
diff --git a/mail-client/mutt/mutt-1.8.2.ebuild b/mail-client/mutt/mutt-1.8.2.ebuild
index ef287d76cc0..25977fd875d 100644
--- a/mail-client/mutt/mutt-1.8.2.ebuild
+++ b/mail-client/mutt/mutt-1.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-04-21 7:34 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-04-21 7:34 UTC (permalink / raw
To: gentoo-commits
commit: 46532a39fc79518ba39af714919d7f21b6b4c1d3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 07:33:51 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 07:34:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46532a39
mail-client/mutt: bump patchset for another fix for USE=notmuch, cleanup
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/mutt/Manifest | 6 +-
mail-client/mutt/mutt-1.7.2-r1.ebuild | 274 ----------------------------------
mail-client/mutt/mutt-1.7.2-r2.ebuild | 251 -------------------------------
mail-client/mutt/mutt-1.8.0-r1.ebuild | 252 -------------------------------
mail-client/mutt/mutt-1.8.2.ebuild | 2 +-
5 files changed, 2 insertions(+), 783 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a4e6f55e7f6..edc0a66ada7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,10 +3,6 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
-DIST mutt-1.8.0.tar.gz 4116223 SHA256 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab SHA512 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d WHIRLPOOL 5a47aa961a3172b8ff731ce2ad19eb6cece6f31fc18cad8bb6cba821670a3a5c17196447c2711bc7be9f40826c8d6b25c3081bd0b8366f1921487f05c5ca641b
DIST mutt-1.8.2.tar.gz 4118429 SHA256 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 SHA512 a5db6154c6baf96e64e9b55b866052b1dae96166b9993fd9a55dc9801a525b50539d26b68d04983f70e9cc1927d95b5b9057f153ce579398e711a24bbd04869c WHIRLPOOL 338728bd97c1bad36b71fb187b2bd91b517f987049aef7ead0cb8baaefc5b2828991590569980e97b8228fe870cf77439ab01577e3c6dcc10684858be9f1a64c
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
-DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb
-DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d
-DIST mutt-gentoo-1.8.0-patches-r1.tar.xz 116584 SHA256 73d23e90b8486d41ee2734d0734e7176bc78945d10f2eb8593923e6739115459 SHA512 8ddb181d6a2d31e128106769b330eec140e1305271bd6d316dd0a8b1cf7a4b339430a4d948711d1470251d1d3804239cbbfa36521b9b6e187d378d87e92d5c9a WHIRLPOOL 2417c7ff86987a027a256ac6e19bd90ad1cd2e0f2ab094208f61304779e3497a35ec4c6ed01cec20312bfd0075691d9d9b9699d91a74640d97047b01b6cf9508
-DIST mutt-gentoo-1.8.2-patches-r1.tar.xz 134744 SHA256 3fb154e1cf88e4da41bc51629f8b10379b0b1949a1335e578509efaac8a5afa1 SHA512 b4018e3d50adfbb9d5acefb6f6d26a30ebddee46bba0b7c1b7eeea1de5d2ac35909e5db958888f3e1d3f86b32b71eb338f52d508e1bf033dd9bb1a5cf670678c WHIRLPOOL 25d05fa5a833c59fd747950bb8e6b5194bab5eeb2a0cf1f308e8fc849d7866f957d5729fb7a39c43e85de36f90f3cc310aaf6956397a490eb72a9ff7ab5d1bcc
+DIST mutt-gentoo-1.8.2-patches-r2.tar.xz 134776 SHA256 912618e9d2bef70f60767f857641e4061ebca1df4e6b64dbb59f5cb4d1265f2b SHA512 e261e9e146a7f6ef82fadc927536bb2113e94eb322e59d3d11147b417a2f30e03e978b58a66b576d26f1312727f140b7f548c6954f1be21776556d5136d7c908 WHIRLPOOL 1b761bb42c824378113d873cf47b616772690da1b0984a405a210b3bfcfd316a22815ef62b378b6f16807fe20a4888fcfc057caa961cf6832f531c4ebfb0ebf5
diff --git a/mail-client/mutt/mutt-1.7.2-r1.ebuild b/mail-client/mutt/mutt-1.7.2-r1.ebuild
deleted file mode 100644
index 602131632ec..00000000000
--- a/mail-client/mutt/mutt-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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 idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
-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
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0:= )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- 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}"/gentoo-mutt-${PV}-patches
-
- if use !vanilla ; then
- # apply patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- local patches=(
- patches-mutt
- bugs-gentoo
- features-common
- features-extra
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- 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 debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable imap)"
- "$(use_enable nls)"
- "$(use_enable nntp)"
- "$(use_enable pop)"
- "$(use_enable sidebar)"
- "$(use_enable smime)"
- "$(use_enable smtp)"
- "$(use_enable notmuch)"
- "$(use_with idn)"
- "$(use_with kerberos gss)"
- "--with-$(use slang && echo slang || echo 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
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- local hcaches=(
- "tokyocabinet"
- "qdbm"
- "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
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf+=( "--with-gnutls" )
- elif use ssl; then
- myconf+=( "--with-ssl" )
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf+=( "$(use_with sasl)" )
- else
- myconf+=(
- "--without-gnutls"
- "--without-ssl"
- "--without-sasl"
- )
- fi
-
- 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 /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
-}
diff --git a/mail-client/mutt/mutt-1.7.2-r2.ebuild b/mail-client/mutt/mutt-1.7.2-r2.ebuild
deleted file mode 100644
index fdb80dfaa7a..00000000000
--- a/mail-client/mutt/mutt-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# 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="r3"
-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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
-REQUIRED_USE="
- hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
- imap? ( ssl )
- pop? ( ssl )
- nntp? ( ssl )
- smime? ( 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:= )
- 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}"/gentoo-mutt-${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.7
- # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.7
- local patches=(
- patches-mutt
- bugs-gentoo
- features-common
- features-extra
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- 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 debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
- "$(use_enable sidebar)"
- "$(use_enable 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 /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
-}
diff --git a/mail-client/mutt/mutt-1.8.0-r1.ebuild b/mail-client/mutt/mutt-1.8.0-r1.ebuild
deleted file mode 100644
index 25977fd875d..00000000000
--- a/mail-client/mutt/mutt-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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="r1"
-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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
-REQUIRED_USE="
- hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
- imap? ( ssl )
- pop? ( ssl )
- nntp? ( ssl )
- smime? ( 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:= )
- 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 debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
- "$(use_enable sidebar)"
- "$(use_enable 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 /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
-}
diff --git a/mail-client/mutt/mutt-1.8.2.ebuild b/mail-client/mutt/mutt-1.8.2.ebuild
index 25977fd875d..9e1a14057dd 100644
--- a/mail-client/mutt/mutt-1.8.2.ebuild
+++ b/mail-client/mutt/mutt-1.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r2"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-06-04 8:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-06-04 8:05 UTC (permalink / raw
To: gentoo-commits
commit: addfe3844bf944cabde59e07adb112dfbef3ecac
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 08:04:23 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 08:04:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=addfe384
mail-client/mutt: version bump to 1.8.3
Package-Manager: Portage-2.3.5, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.8.3.ebuild | 252 +++++++++++++++++++++++++++++++++++++
2 files changed, 254 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index edc0a66ada7..05a8c8a4895 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,5 +4,7 @@ DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
DIST mutt-1.8.2.tar.gz 4118429 SHA256 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 SHA512 a5db6154c6baf96e64e9b55b866052b1dae96166b9993fd9a55dc9801a525b50539d26b68d04983f70e9cc1927d95b5b9057f153ce579398e711a24bbd04869c WHIRLPOOL 338728bd97c1bad36b71fb187b2bd91b517f987049aef7ead0cb8baaefc5b2828991590569980e97b8228fe870cf77439ab01577e3c6dcc10684858be9f1a64c
+DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.8.2-patches-r2.tar.xz 134776 SHA256 912618e9d2bef70f60767f857641e4061ebca1df4e6b64dbb59f5cb4d1265f2b SHA512 e261e9e146a7f6ef82fadc927536bb2113e94eb322e59d3d11147b417a2f30e03e978b58a66b576d26f1312727f140b7f548c6954f1be21776556d5136d7c908 WHIRLPOOL 1b761bb42c824378113d873cf47b616772690da1b0984a405a210b3bfcfd316a22815ef62b378b6f16807fe20a4888fcfc057caa961cf6832f531c4ebfb0ebf5
+DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
diff --git a/mail-client/mutt/mutt-1.8.3.ebuild b/mail-client/mutt/mutt-1.8.3.ebuild
new file mode 100644
index 00000000000..b9e0fd0f6fc
--- /dev/null
+++ b/mail-client/mutt/mutt-1.8.3.ebuild
@@ -0,0 +1,252 @@
+# 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="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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+REQUIRED_USE="
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ nntp? ( ssl )
+ smime? ( 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:= )
+ 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 debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable notmuch)"
+ "$(use_enable sidebar)"
+ "$(use_enable 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-06-16 14:10 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2017-06-16 14:10 UTC (permalink / raw
To: gentoo-commits
commit: cb2d05b1c2c0b044d6d18f134379aca44ba75191
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 14:08:32 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 14:08:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2d05b1
mail-client/mutt: amd64 stable wrt bug #604902
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index 848adca88b6..f9d012186f0 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-06-17 17:24 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2017-06-17 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 8758c3b4173a341631fb89e7c7f15b3c759a15a9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 17:22:05 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 17:22:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8758c3b4
mail-client/mutt: x86 stable wrt bug #604902
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index f9d012186f0..ee2aac154fd 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-06-25 8:02 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2017-06-25 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 5a2e319258302a97ce83085428e5c10388032296
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:55:31 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 08:01:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2e3192
mail-client/mutt: ia64 stable, bug #604902
Package-Manager: Portage-2.3.6, Repoman-2.3.2
mail-client/mutt/mutt-1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index 1dd1c0e3d24..e72c520ac64 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-07-10 16:51 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-07-10 16:51 UTC (permalink / raw
To: gentoo-commits
commit: cfe0ecbe7f0b98e16fb7f5cf47f969d60cbf9933
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 16:50:43 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 16:50:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe0ecbe
mail-client/mutt: drop old ebuilds, bug #604902
Package-Manager: Portage-2.3.6, Repoman-2.3.1
mail-client/mutt/Manifest | 6 -
mail-client/mutt/mutt-1.5.23-r7.ebuild | 251 ------------------------------
mail-client/mutt/mutt-1.5.24-r2.ebuild | 271 ---------------------------------
mail-client/mutt/mutt-1.8.2.ebuild | 252 ------------------------------
4 files changed, 780 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 05a8c8a4895..67f9939b19b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,4 @@
-DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
-DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
-DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
-DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
-DIST mutt-1.8.2.tar.gz 4118429 SHA256 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 SHA512 a5db6154c6baf96e64e9b55b866052b1dae96166b9993fd9a55dc9801a525b50539d26b68d04983f70e9cc1927d95b5b9057f153ce579398e711a24bbd04869c WHIRLPOOL 338728bd97c1bad36b71fb187b2bd91b517f987049aef7ead0cb8baaefc5b2828991590569980e97b8228fe870cf77439ab01577e3c6dcc10684858be9f1a64c
DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
-DIST mutt-gentoo-1.8.2-patches-r2.tar.xz 134776 SHA256 912618e9d2bef70f60767f857641e4061ebca1df4e6b64dbb59f5cb4d1265f2b SHA512 e261e9e146a7f6ef82fadc927536bb2113e94eb322e59d3d11147b417a2f30e03e978b58a66b576d26f1312727f140b7f548c6954f1be21776556d5136d7c908 WHIRLPOOL 1b761bb42c824378113d873cf47b616772690da1b0984a405a210b3bfcfd316a22815ef62b378b6f16807fe20a4888fcfc057caa961cf6832f531c4ebfb0ebf5
DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
deleted file mode 100644
index 5c06980881f..00000000000
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r7"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="ia64 sparc x86" # last stable
-CDEPEND="
- app-misc/mime-types
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6:= ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6:= ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6:= ) )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.8.0 )
- smime? ( >=dev-libs/openssl-0.9.6:0= )
- 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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- # we conditionalise this one, simply because it has considerable
- # impact on the code
- if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-20140412.patch
- epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
- epatch "${PATCHDIR}"/sidebar-counts.patch
- fi
-
- local upatches=
- # allow user patches
- epatch_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang) \
- --enable-compressed \
- --enable-external-dotlock \
- --enable-nfs-fix \
- --sysconfdir=${EPREFIX}/etc/${PN} \
- --with-curses \
- --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
- --with-regex \
- --with-exec-shell=${EPREFIX}/bin/sh"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf="${myconf} --enable-fcntl --disable-flock"
- ;;
- *)
- myconf="${myconf} --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- fi
-}
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
deleted file mode 100644
index 644638020d3..00000000000
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r1"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
- https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-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
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0 <app-crypt/gpgme-1.8.0 )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- 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 )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
- # Post-release hot-fixes grabbed from HG, this is what all following
- # patches are based on in my Mercurial patchqueue (mq).
- # If you ever take over or need to modify patches here, just check
- # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
- # the patchqueue as it'll save you a lot of work.
- # http://hg.code.sf.net/p/gentoomutt/code/
- # http://hg.code.sf.net/p/gentoomuttpatches/code/
- for rev in $(eval echo {0..${PR#r}}) ; do
- local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
- [[ -e ${revpatch} ]] && \
- epatch "${revpatch}"
- done
- # fix compilation with ncurses[tinfo], #459260
- epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
- # this patch is non-generic and only works because we use a sysconfdir
- # different from the one used by the mailbase ebuild
- use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
- # must have fixes to compile or behave correctly, upstream
- # ignores, disagrees or simply doesn't respond/apply
- epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
- # same category, but functional bits
- epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
- # the big feature patches that upstream doesn't want to include, but
- # nearly every distro has due to their usefulness
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
- epatch "${p}"
- done
-
- # we conditionalise this one, simply because it has considerable
- # impact on the code
- if use sidebar ; then
- epatch "${PATCHDIR}"/sidebar-20140412.patch
- epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
- epatch "${PATCHDIR}"/sidebar-counts.patch
- fi
-
- local upatches=
- # allow user patches
- epatch_user && upatches=" with user patches"
-
- # patch version string for bug reports
- sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
-
- # don't just build documentation (lengthy process, with big dependencies)
- if use !doc ; then
- sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
- fi
-}
-
-src_configure() {
- local myconf="
- $(use_enable crypt pgp) \
- $(use_enable debug) \
- $(use_enable gpg gpgme) \
- $(use_enable imap) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable pop) \
- $(use_enable smime) \
- $(use_enable smtp) \
- $(use_with idn) \
- $(use_with kerberos gss) \
- $(use slang && echo --with-slang=${EPREFIX}/usr) \
- $(use !slang && echo --with-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"
-
- case $CHOST in
- *-solaris*)
- # Solaris has no flock in the standard headers
- myconf+=" --enable-fcntl --disable-flock"
- # wchar_t depends on locale
- myconf+=" --without-wc-funcs"
- ;;
- *)
- myconf+=" --disable-fcntl --enable-flock"
- ;;
- esac
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- if use tokyocabinet; then
- myconf="${myconf} --enable-hcache \
- --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- elif use qdbm; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
- elif use gdbm ; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
- elif use berkdb; then
- myconf="${myconf} --enable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
- else
- myconf="${myconf} --disable-hcache \
- --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
- fi
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf="${myconf} --with-gnutls"
- elif use ssl; then
- myconf="${myconf} --with-ssl"
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf="${myconf} $(use_with sasl)"
- else
- myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
- fi
-
- if use mbox; then
- myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
- else
- myconf="${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 /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
- fi
-}
diff --git a/mail-client/mutt/mutt-1.8.2.ebuild b/mail-client/mutt/mutt-1.8.2.ebuild
deleted file mode 100644
index 9e1a14057dd..00000000000
--- a/mail-client/mutt/mutt-1.8.2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
-REQUIRED_USE="
- hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
- imap? ( ssl )
- pop? ( ssl )
- nntp? ( ssl )
- smime? ( 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:= )
- 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 debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
- "$(use_enable sidebar)"
- "$(use_enable 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 /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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-09-09 19:14 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-09-09 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 1ab08c3c1c1dbfc2799f3c56f6207d7a489f5c0d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 19:13:52 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 19:14:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab08c3c
mail-client/mutt: version bump to 1.9.0, bug #629748
Package-Manager: Portage-2.3.6, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.9.0.ebuild | 252 +++++++++++++++++++++++++++++++++++++
2 files changed, 254 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 67f9939b19b..fa360b6715d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d
+DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
+DIST mutt-gentoo-1.9.0-patches-r0.tar.xz 110868 SHA256 c634dd4c59be6489b8a69d0fe60095aea2013ad7403acc83472797d37413e31c SHA512 1abf29432e569c7adc99d3cb3c6f3efc843987e43354229c6cf99e55f7adec6b3e509b9e1c7f2f4029900c7013ba6dd330758e0f4e33e1a2b590a7bb89797fbc WHIRLPOOL ec6f2d836f2abf18335f6eb5d27f7e157bdb0ef979458e49399ddcf39ff437f359a36a795754abb36564d4765cecd4f7b4ab3408837140c34241f71e689502bf
diff --git a/mail-client/mutt/mutt-1.9.0.ebuild b/mail-client/mutt/mutt-1.9.0.ebuild
new file mode 100644
index 00000000000..f7385cf0194
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.0.ebuild
@@ -0,0 +1,252 @@
+# 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="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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix"
+REQUIRED_USE="
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ nntp? ( ssl )
+ smime? ( 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:= )
+ 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 debug)"
+ "$(use_enable doc)"
+ "$(use_enable gpg gpgme)"
+ "$(use_enable nls)"
+ "$(use_enable notmuch)"
+ "$(use_enable sidebar)"
+ "$(use_enable 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-09-11 18:17 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-09-11 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 1f504b1345b7c76525c2186797d6d9be15dc7101
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 18:14:58 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:17:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f504b13
mail-client/mutt: revbump to 1.9.0-r1 to fix faulty patchset
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.9.0.ebuild => mutt-1.9.0-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index fa360b6715d..9cba44db41c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10
DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
-DIST mutt-gentoo-1.9.0-patches-r0.tar.xz 110868 SHA256 c634dd4c59be6489b8a69d0fe60095aea2013ad7403acc83472797d37413e31c SHA512 1abf29432e569c7adc99d3cb3c6f3efc843987e43354229c6cf99e55f7adec6b3e509b9e1c7f2f4029900c7013ba6dd330758e0f4e33e1a2b590a7bb89797fbc WHIRLPOOL ec6f2d836f2abf18335f6eb5d27f7e157bdb0ef979458e49399ddcf39ff437f359a36a795754abb36564d4765cecd4f7b4ab3408837140c34241f71e689502bf
+DIST mutt-gentoo-1.9.0-patches-r1.tar.xz 113608 SHA256 1b6c37afba0ea596359924fa297b62ef570ad4125b219b407c221ff39d8640b8 SHA512 117819c24799699de6c0723440917aab3cb1b61ffd5305971410414b011c246c261e8e9f993c20c38cfdf863343eaefde0322d24783d3b8babc182a41ca49dcd WHIRLPOOL 613f832968f30bf6e598b7b6bcab77ba66f33ae54b2737f5147a16beb082fe0e2ba66df6d38b10e182cdb3bd9e03983ebfac65dbec6fecc19f623f556dd69d4c
diff --git a/mail-client/mutt/mutt-1.9.0.ebuild b/mail-client/mutt/mutt-1.9.0-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.0.ebuild
rename to mail-client/mutt/mutt-1.9.0-r1.ebuild
index f7385cf0194..4491727bd3a 100644
--- a/mail-client/mutt/mutt-1.9.0.ebuild
+++ b/mail-client/mutt/mutt-1.9.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-09-12 10:50 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-09-12 10:50 UTC (permalink / raw
To: gentoo-commits
commit: a508d2e34e512e0b7288bfdaa1fc977667407388
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 09:56:45 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 10:49:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a508d2e3
mail-client/mutt: bump patchset to fix notmuch compilation failures, bugs #629748, #629748
Package-Manager: Portage-2.3.6, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.9.0-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 9cba44db41c..dee4c54774d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10
DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
-DIST mutt-gentoo-1.9.0-patches-r1.tar.xz 113608 SHA256 1b6c37afba0ea596359924fa297b62ef570ad4125b219b407c221ff39d8640b8 SHA512 117819c24799699de6c0723440917aab3cb1b61ffd5305971410414b011c246c261e8e9f993c20c38cfdf863343eaefde0322d24783d3b8babc182a41ca49dcd WHIRLPOOL 613f832968f30bf6e598b7b6bcab77ba66f33ae54b2737f5147a16beb082fe0e2ba66df6d38b10e182cdb3bd9e03983ebfac65dbec6fecc19f623f556dd69d4c
+DIST mutt-gentoo-1.9.0-patches-r2.tar.xz 113688 SHA256 c56aee70438ce6ee8ff99a9eeb6cb1865ef5ddacd4d34d89f942bfe5a1acc74a SHA512 8996548b59d633dc78940c7318262f8c467e62f79d1fb3e7abf955c45697bdd74b2e86535d649f33f6ca31bdc7017c409519494abcc06c0836b197a4c77f474e WHIRLPOOL 6789a477604c8f9fbb52e91a7a8872e6cf3e3bd2614d4e4c12b846aee259fde80c2da42891db785774ea5d39b47e2dab0c051d2707abb873d6ddc5d9e8de9409
diff --git a/mail-client/mutt/mutt-1.9.0-r1.ebuild b/mail-client/mutt/mutt-1.9.0-r1.ebuild
index 4491727bd3a..98ae31060e1 100644
--- a/mail-client/mutt/mutt-1.9.0-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r2"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-09-21 8:17 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-09-21 8:17 UTC (permalink / raw
To: gentoo-commits
commit: e89b57c06d7c9accfe0696e00647bd39da0dc779
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 08:16:20 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 08:16:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89b57c0
mail-client/mutt: revbump for some fixes from upstream
Package-Manager: Portage-2.3.8, Repoman-2.3.1
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.9.0-r1.ebuild => mutt-1.9.0-r2.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index dee4c54774d..43a0d653264 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10
DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
-DIST mutt-gentoo-1.9.0-patches-r2.tar.xz 113688 SHA256 c56aee70438ce6ee8ff99a9eeb6cb1865ef5ddacd4d34d89f942bfe5a1acc74a SHA512 8996548b59d633dc78940c7318262f8c467e62f79d1fb3e7abf955c45697bdd74b2e86535d649f33f6ca31bdc7017c409519494abcc06c0836b197a4c77f474e WHIRLPOOL 6789a477604c8f9fbb52e91a7a8872e6cf3e3bd2614d4e4c12b846aee259fde80c2da42891db785774ea5d39b47e2dab0c051d2707abb873d6ddc5d9e8de9409
+DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467
diff --git a/mail-client/mutt/mutt-1.9.0-r1.ebuild b/mail-client/mutt/mutt-1.9.0-r2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.0-r1.ebuild
rename to mail-client/mutt/mutt-1.9.0-r2.ebuild
index 98ae31060e1..65775739fc4 100644
--- a/mail-client/mutt/mutt-1.9.0-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r2"
+PATCHREV="r3"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-09-24 9:15 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-09-24 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 9806e68fe57a1713255f06fe2bb93915aa88aaa2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 09:14:57 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 09:15:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9806e68f
mail-client/mutt: version bump to 1.9.1
Package-Manager: Portage-2.3.8, Repoman-2.3.1
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.8.3.ebuild => mutt-1.9.1.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 43a0d653264..9fe7ae37c18 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
-DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d
DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
+DIST mutt-1.9.1.tar.gz 4193868 SHA256 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095 WHIRLPOOL 8333c27b4271c9536329cef56c4a3e7af039c099f12dae06b269c7c0a99714fe70a33c9868150a7fcdb55bd22d029d434d225fe07a748011fce2a0ef56e81bd8
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
-DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999
DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467
+DIST mutt-gentoo-1.9.1-patches-r0.tar.xz 112300 SHA256 9d3c18ae5602c2e6881faf02eeffd87233589ed85eed99624834858768d3480f SHA512 c8686042e570c9411e7c36a539068a95e9a2d691a7b88226b2ab0875fdcea7aeadbe549858374221ea40844301aa592c244e5fe3aeeeddf8dcf88ecc88129b3a WHIRLPOOL 3665504c548c8439e475b70f672df8db3e56295db94354b6e45f4deab8a7bf23e1933df90a93228d9053bb451df7869e39cb048e8eb310ee06fbb90f950568a5
diff --git a/mail-client/mutt/mutt-1.8.3.ebuild b/mail-client/mutt/mutt-1.9.1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.8.3.ebuild
rename to mail-client/mutt/mutt-1.9.1.ebuild
index b9e0fd0f6fc..f7385cf0194 100644
--- a/mail-client/mutt/mutt-1.8.3.ebuild
+++ b/mail-client/mutt/mutt-1.9.1.ebuild
@@ -14,7 +14,7 @@ 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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix"
REQUIRED_USE="
hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
imap? ( ssl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-10-19 6:07 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-10-19 6:07 UTC (permalink / raw
To: gentoo-commits
commit: 8311156433bc263368ab03183df31e79ada5f561
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 06:07:00 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 06:07:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83111564
mail-client/mutt: 1.9.1-r1 revbump for idle fix
Package-Manager: Portage-2.3.11-prefix, Repoman-2.3.3
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.9.1.ebuild => mutt-1.9.1-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 9fe7ae37c18..a1017b3f41d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc068
DIST mutt-1.9.1.tar.gz 4193868 SHA256 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095 WHIRLPOOL 8333c27b4271c9536329cef56c4a3e7af039c099f12dae06b269c7c0a99714fe70a33c9868150a7fcdb55bd22d029d434d225fe07a748011fce2a0ef56e81bd8
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467
-DIST mutt-gentoo-1.9.1-patches-r0.tar.xz 112300 SHA256 9d3c18ae5602c2e6881faf02eeffd87233589ed85eed99624834858768d3480f SHA512 c8686042e570c9411e7c36a539068a95e9a2d691a7b88226b2ab0875fdcea7aeadbe549858374221ea40844301aa592c244e5fe3aeeeddf8dcf88ecc88129b3a WHIRLPOOL 3665504c548c8439e475b70f672df8db3e56295db94354b6e45f4deab8a7bf23e1933df90a93228d9053bb451df7869e39cb048e8eb310ee06fbb90f950568a5
+DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 SHA256 47a5a9db7065ecda36ea65a603f6a1752e7ca73f157363c832e91a289909efa4 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5 WHIRLPOOL 8b4da87c174112c2518ed1429ed17a73eda7134b58ee7ae8053051cc017f652f17b4465346348022b7867542ceb8f35044c48deb42b7ed99a358f86980d9d2ce
diff --git a/mail-client/mutt/mutt-1.9.1.ebuild b/mail-client/mutt/mutt-1.9.1-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.1.ebuild
rename to mail-client/mutt/mutt-1.9.1-r1.ebuild
index f7385cf0194..4491727bd3a 100644
--- a/mail-client/mutt/mutt-1.9.1.ebuild
+++ b/mail-client/mutt/mutt-1.9.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-02 11:22 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-02 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 855773591d1850b7c71ab52cb8c41f9b5a77f87f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 11:21:20 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 11:21:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85577359
mail-client/mutt: improve USE-flag descriptions, bug #637266
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/Manifest | 12 ++++++------
mail-client/mutt/metadata.xml | 24 +++++++++++++++---------
2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a1017b3f41d..876fb0a9182 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
-DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
-DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
-DIST mutt-1.9.1.tar.gz 4193868 SHA256 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095 WHIRLPOOL 8333c27b4271c9536329cef56c4a3e7af039c099f12dae06b269c7c0a99714fe70a33c9868150a7fcdb55bd22d029d434d225fe07a748011fce2a0ef56e81bd8
-DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
-DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467
-DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 SHA256 47a5a9db7065ecda36ea65a603f6a1752e7ca73f157363c832e91a289909efa4 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5 WHIRLPOOL 8b4da87c174112c2518ed1429ed17a73eda7134b58ee7ae8053051cc017f652f17b4465346348022b7867542ceb8f35044c48deb42b7ed99a358f86980d9d2ce
+DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
+DIST mutt-1.9.0.tar.gz 4191932 BLAKE2B 8ec3bf68f6ae4e12875d396fcd097070110f349cf0ff84ed3897e597d98cf658ef11c2a6323ee8fae8e3b242442f206fdcef5de16576a060db19a5ee7edc0697 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03
+DIST mutt-1.9.1.tar.gz 4193868 BLAKE2B 44623e3fd75e9f599daf044be54913944f894a5e05a8cb4e669c5d44e6bfab9caecbf0e0eb0fd6ebe0c0d177a141c78f1e837ad3059260e29326867c9db201b0 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
+DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
+DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 BLAKE2B 157060a7f0d2833c311fdc68ee02e1b52cd9feeb18236e6e3f7d8a3ad75acd6d2fdbc7c11dbf29a298d9d88056b1d0eee3abd9fd508d04aca6e47877ce78ee1c SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69
+DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 BLAKE2B 9992f7977a6a2a39f1bc6d3da092477c2da065342ec1aacd2315fd204732aca5fe4a9a33cf5233660de213c87e53f94b87d65cce7084954391c9b8c95b650ae7 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 0e7f081573f..2dd05eace0a 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -9,17 +9,23 @@
<name>Net-Mail</name>
</maintainer>
<use>
- <flag name="hcache">Enable header cache</flag>
- <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
- <flag name="pop">Enable support for POP3</flag>
- <flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
- header caching</flag>
+ <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</flag>
- <flag name="smtp">Enable support for smtp</flag>
- <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
- database backend for header caching</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>
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-02 11:24 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-02 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 951e29f2186d1bbdd0d72591d98c2b0dfeec57c3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 11:24:41 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 11:24:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951e29f2
mail-client/mutt: fix spacing of metadata.xml
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/metadata.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 2dd05eace0a..75c5b94f614 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -9,23 +9,23 @@
<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="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>
+ <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
+ database backend for header caching</flag>
</use>
<upstream>
<remote-id type="sourceforge">mutt</remote-id>
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-10 10:58 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-10 10:58 UTC (permalink / raw
To: gentoo-commits
commit: 6cba6c3e5d117323362aee58420ec5c47e36c341
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 10:58:25 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 10:58:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cba6c3e
mail-client/mutt: update patchset for USE=notmuch, bug #635930
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.9.1-r1.ebuild => mutt-1.9.1-r2.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 876fb0a9182..13a8d143ebb 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.9.0.tar.gz 4191932 BLAKE2B 8ec3bf68f6ae4e12875d396fcd097070110f349cf
DIST mutt-1.9.1.tar.gz 4193868 BLAKE2B 44623e3fd75e9f599daf044be54913944f894a5e05a8cb4e669c5d44e6bfab9caecbf0e0eb0fd6ebe0c0d177a141c78f1e837ad3059260e29326867c9db201b0 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 BLAKE2B 157060a7f0d2833c311fdc68ee02e1b52cd9feeb18236e6e3f7d8a3ad75acd6d2fdbc7c11dbf29a298d9d88056b1d0eee3abd9fd508d04aca6e47877ce78ee1c SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69
-DIST mutt-gentoo-1.9.1-patches-r1.tar.xz 112940 BLAKE2B 9992f7977a6a2a39f1bc6d3da092477c2da065342ec1aacd2315fd204732aca5fe4a9a33cf5233660de213c87e53f94b87d65cce7084954391c9b8c95b650ae7 SHA512 ad658140a39e59c84b3c5dcee0585ec6f462ce60093dac2c77e2a77ef792a4214c4f966fe4e9c29a84d333b4249a5336d1d8a3fdaeef5368ebbc7edfb4c2ebf5
+DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
diff --git a/mail-client/mutt/mutt-1.9.1-r1.ebuild b/mail-client/mutt/mutt-1.9.1-r2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.1-r1.ebuild
rename to mail-client/mutt/mutt-1.9.1-r2.ebuild
index 4491727bd3a..98ae31060e1 100644
--- a/mail-client/mutt/mutt-1.9.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r2"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-10 13:46 Nicolas Bock
0 siblings, 0 replies; 249+ messages in thread
From: Nicolas Bock @ 2017-12-10 13:46 UTC (permalink / raw
To: gentoo-commits
commit: b92b1c6b2c267748be8c748ebcf9ff9a6ec456b5
Author: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 13:45:56 2017 +0000
Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 13:45:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92b1c6b
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
mail-client/mutt/metadata.xml | 67 +++++----
mail-client/mutt/mutt-1.9.1-r3.ebuild | 264 ++++++++++++++++++++++++++++++++++
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."
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-10 16:31 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-10 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 61ed2944f8c0f58ea84a9441f02a6f676a945007
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 16:30:58 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 16:31:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ed2944
mail-client/mutt: add rdeps for crypt/smime flags to finish #637178
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/mutt-1.9.1-r3.ebuild | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.1-r3.ebuild b/mail-client/mutt/mutt-1.9.1-r3.ebuild
index fab20c02df2..1cd2ae74c65 100644
--- a/mail-client/mutt/mutt-1.9.1-r3.ebuild
+++ b/mail-client/mutt/mutt-1.9.1-r3.ebuild
@@ -65,6 +65,10 @@ DEPEND="${CDEPEND}
)"
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() {
@@ -240,25 +244,13 @@ pkg_postinst() {
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 "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."
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-14 7:47 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-14 7:47 UTC (permalink / raw
To: gentoo-commits
commit: e369d1526c6bfc989610e325c50116bbafc11071
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 07:45:23 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 07:47:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e369d152
mail-client/mutt: fix USE-flags enabling after rename change, bug #640824
Closes: https://bugs.gentoo.org/640824
Package-Manager: Portage-2.3.13, Repoman-2.3.3
.../{mutt-1.9.1-r3.ebuild => mutt-1.9.1-r4.ebuild} | 72 ++++++++++++++--------
1 file changed, 45 insertions(+), 27 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.1-r3.ebuild b/mail-client/mutt/mutt-1.9.1-r4.ebuild
similarity index 80%
rename from mail-client/mutt/mutt-1.9.1-r3.ebuild
rename to mail-client/mutt/mutt-1.9.1-r4.ebuild
index 1cd2ae74c65..0cad65143c1 100644
--- a/mail-client/mutt/mutt-1.9.1-r3.ebuild
+++ b/mail-client/mutt/mutt-1.9.1-r4.ebuild
@@ -121,31 +121,41 @@ src_prepare() {
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)"
+ # 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_enable imap)"
- "$(use_enable pop)"
- "$(use_enable nntp)"
- "$(use_enable smtp)"
+ $(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)
+ $(use_enable sidebar)
+
+ # 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 idn)"
- "$(use_with kerberos gss)"
- "$(use_with sasl)"
- "$(use slang && echo --with-slang=${EPREFIX}/usr)"
+ $(use_with sasl)
+ $(use_with idn)
+ $(use_with kerberos gss)
+ "$(use slang && echo --with-slang=${EPREFIX}/usr || echo a=b)"
"$(use_with !slang curses ${EPREFIX}/usr)"
"--enable-compressed"
@@ -245,12 +255,20 @@ pkg_postinst() {
elog " https://wiki.gentoo.org/wiki/Mutt"
echo
fi
- 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."
+ 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
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-16 13:08 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-16 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 91e4e4a2af51cf72b6068bc4632a2ca16d2e1397
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 13:08:01 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 13:08:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e4e4a2
mail-client/mutt: version bump to 1.9.2
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
mail-client/mutt/Manifest | 4 +-
mail-client/mutt/metadata.xml | 3 +
mail-client/mutt/mutt-1.9.1-r2.ebuild | 252 ---------------------
.../{mutt-1.9.0-r2.ebuild => mutt-1.9.2.ebuild} | 107 +++++----
4 files changed, 69 insertions(+), 297 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 13a8d143ebb..5ff5c82abc1 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-DIST mutt-1.9.0.tar.gz 4191932 BLAKE2B 8ec3bf68f6ae4e12875d396fcd097070110f349cf0ff84ed3897e597d98cf658ef11c2a6323ee8fae8e3b242442f206fdcef5de16576a060db19a5ee7edc0697 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03
DIST mutt-1.9.1.tar.gz 4193868 BLAKE2B 44623e3fd75e9f599daf044be54913944f894a5e05a8cb4e669c5d44e6bfab9caecbf0e0eb0fd6ebe0c0d177a141c78f1e837ad3059260e29326867c9db201b0 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
+DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b82ed8839530332eb699214ab2f3a3bf7f65c399ae663b12ca31c8d539b1e39915b2614c15168f0e3bda8be46 SHA512 3e35f3d27f1444bcee38e98fe62d41c7fa5b56ac9d5010b1c2cbf034c1e707491a09ccc7387b8d90d8c6c7150edf1d9093fec981d348cf9495313859d373b339
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
-DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 BLAKE2B 157060a7f0d2833c311fdc68ee02e1b52cd9feeb18236e6e3f7d8a3ad75acd6d2fdbc7c11dbf29a298d9d88056b1d0eee3abd9fd508d04aca6e47877ce78ee1c SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69
DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
+DIST mutt-gentoo-1.9.2-patches-r0.tar.xz 112224 BLAKE2B 7c5a5e67029e8c2775a1aeb876c5ee87c5616d748b08457364da07eccde5d3baecb328a95ef2fae7755be72b08d553d4beea08ccc751e146ce46694eac0c1f73 SHA512 b2ba382c21fe8d31059dd58760bba1ecd0b8fd256b3ade3d4dc0ea3dfa8c94e6ae9ec7baaf4b7c1c6c29d819fc78e9e781f07964478796e882903c0e9e438342
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 217549fa2db..f4506027293 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -35,7 +35,10 @@
S/MIME</flag>
</use>
<upstream>
+ <!-- for releases before 1.9.2 -->
<remote-id type="sourceforge">mutt</remote-id>
<remote-id type="bitbucket">mutt/mutt</remote-id>
+ <!-- from 1.9.2 onwards -->
+ <remote-id type="gitlab">muttmua/mutt</remote-id>
</upstream>
</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.9.1-r2.ebuild b/mail-client/mutt/mutt-1.9.1-r2.ebuild
deleted file mode 100644
index 98ae31060e1..00000000000
--- a/mail-client/mutt/mutt-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix"
-REQUIRED_USE="
- hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
- imap? ( ssl )
- pop? ( ssl )
- nntp? ( ssl )
- smime? ( 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:= )
- 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 debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
- "$(use_enable sidebar)"
- "$(use_enable 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
-}
diff --git a/mail-client/mutt/mutt-1.9.0-r2.ebuild b/mail-client/mutt/mutt-1.9.2.ebuild
similarity index 68%
rename from mail-client/mutt/mutt-1.9.0-r2.ebuild
rename to mail-client/mutt/mutt-1.9.2.ebuild
index 65775739fc4..11f090ed10a 100644
--- a/mail-client/mutt/mutt-1.9.0-r2.ebuild
+++ b/mail-client/mutt/mutt-1.9.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r3"
+PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
@@ -14,16 +14,17 @@ 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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix"
+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 )
- smtp? ( ssl )
- sasl? ( || ( imap pop smtp nntp ) )
- kerberos? ( || ( imap pop smtp nntp ) )"
+ 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"
@@ -49,6 +50,7 @@ CDEPEND="
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= )
@@ -63,6 +65,10 @@ DEPEND="${CDEPEND}
)"
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() {
@@ -72,8 +78,7 @@ src_prepare() {
# 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
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.9
local patches=(
patches-mutt
bugs-gentoo
@@ -84,7 +89,7 @@ src_prepare() {
local patchset
for patchset in "${patches[@]}" ; do
[[ -d "${PATCHDIR}/${patchset}" ]] || continue
- einfo "Applying ${PATCHSET} patchset ${patchset}"
+ einfo "Patches for ${PATCHSET} patchset ${patchset}"
EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
|| die "patchset ${patchset} failed"
done
@@ -115,29 +120,42 @@ src_prepare() {
src_configure() {
local myconf=(
- "$(use_enable crypt pgp)"
- "$(use_enable debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable nls)"
- "$(use_enable notmuch)"
- "$(use_enable sidebar)"
- "$(use_enable smime)"
-
- "$(use_enable imap)"
- "$(use_enable pop)"
- "$(use_enable nntp)"
- "$(use_enable smtp)"
+ # 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)
+ $(use_enable sidebar)
+
+ # 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 idn)"
- "$(use_with kerberos gss)"
- "$(use_with sasl)"
- "$(use slang && echo --with-slang=${EPREFIX}/usr)"
- "$(use_with !slang curses ${EPREFIX}/usr)"
+ $(use_with sasl)
+ $(use_with idn)
+ $(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"
@@ -235,18 +253,21 @@ pkg_postinst() {
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
+ 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
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-16 14:02 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-16 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 3bc1f18aacff4ca0faaf2527267392a1811c1d83
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 14:01:38 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 14:01:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc1f18a
mail-client/mutt: remove USE=sidebar
The sidebar feature is now part of mutt upstream (a while already) so
there's no danger in it being a "wrong" patch. Next to this, it doesn't
add any dependencies of sort, and doesn't change the way of operating,
sidebar still needs to be explicitly enabled. Hence unconditionally
enable sidebar support to reduce USE-flag complexity"
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/mutt-1.9.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.2.ebuild b/mail-client/mutt/mutt-1.9.2.ebuild
index 11f090ed10a..11aec7b0c28 100644
--- a/mail-client/mutt/mutt-1.9.2.ebuild
+++ b/mail-client/mutt/mutt-1.9.2.ebuild
@@ -14,7 +14,7 @@ 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"
+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"
REQUIRED_USE="
hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
imap? ( ssl )
@@ -139,7 +139,6 @@ src_configure() {
$(use_enable doc)
$(use_enable nls)
$(use_enable notmuch)
- $(use_enable sidebar)
# protocols
$(use_enable imap)
@@ -160,6 +159,7 @@ src_configure() {
"--enable-compressed"
"--enable-external-dotlock"
"--enable-nfs-fix"
+ "--enable-sidebar"
"--sysconfdir=${EPREFIX}/etc/${PN}"
"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
"--with-regex"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-16 20:58 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-16 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 7963b3c86d785221f482b8e7f3ed0e1ad0d97902
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 20:58:00 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 20:58:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7963b3c8
mail-client/mutt: supply defaults for REQUIRED_USE, bug #607360
Bug: https://bugs.gentoo.org/607360
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
mail-client/mutt/mutt-1.9.2.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.2.ebuild b/mail-client/mutt/mutt-1.9.2.ebuild
index 11aec7b0c28..1c47717e522 100644
--- a/mail-client/mutt/mutt-1.9.2.ebuild
+++ b/mail-client/mutt/mutt-1.9.2.ebuild
@@ -14,7 +14,7 @@ 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"
+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"
REQUIRED_USE="
hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
imap? ( ssl )
@@ -166,8 +166,9 @@ src_configure() {
"--with-exec-shell=${EPREFIX}/bin/sh"
)
- if [[ ${CHOST} == *-solaris* ]] ; then
+ 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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-30 10:11 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-30 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 42fb314b6f0c830483cd1e2871f0552c9844f678
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 10:10:27 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 10:11:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42fb314b
mail-client/mutt: add a word of warning about USE=gpgme
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
mail-client/mutt/mutt-1.9.2.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mail-client/mutt/mutt-1.9.2.ebuild b/mail-client/mutt/mutt-1.9.2.ebuild
index 1c47717e522..03eefdb98a4 100644
--- a/mail-client/mutt/mutt-1.9.2.ebuild
+++ b/mail-client/mutt/mutt-1.9.2.ebuild
@@ -271,4 +271,9 @@ pkg_postinst() {
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
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2017-12-31 14:48 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2017-12-31 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 345ccc1fd15f1b5c7b14982ac367136aea7b33cb
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 14:47:18 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 14:47:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345ccc1f
mail-client/mutt: revbump for some patches and changes from upstream
pgp_display_signature -> crypt_display_signature and now also works for gpgme
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/Manifest | 1 +
mail-client/mutt/mutt-1.9.2-r1.ebuild | 279 ++++++++++++++++++++++++++++++++++
2 files changed, 280 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 5ff5c82abc1..1151ad46a03 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,3 +4,4 @@ DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b8
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
DIST mutt-gentoo-1.9.2-patches-r0.tar.xz 112224 BLAKE2B 7c5a5e67029e8c2775a1aeb876c5ee87c5616d748b08457364da07eccde5d3baecb328a95ef2fae7755be72b08d553d4beea08ccc751e146ce46694eac0c1f73 SHA512 b2ba382c21fe8d31059dd58760bba1ecd0b8fd256b3ade3d4dc0ea3dfa8c94e6ae9ec7baaf4b7c1c6c29d819fc78e9e781f07964478796e882903c0e9e438342
+DIST mutt-gentoo-1.9.2-patches-r1.tar.xz 113324 BLAKE2B a5ae4ca22001e91de8450086928bc7e3b26a26745d74f2969fb15e1f020037f8caffb92e0990dd9c8d13161afaa99c6cca593f8322f2870e413220447de20b3a SHA512 250323bb7b697ece97846f078f18ae93560f5ea5a8e1cedbc6d30ee21f3b430722e794d7a751ee4f9e673777ff39868c9c1e9dca4d4787b54240df7d981dbb39
diff --git a/mail-client/mutt/mutt-1.9.2-r1.ebuild b/mail-client/mutt/mutt-1.9.2-r1.ebuild
new file mode 100644
index 00000000000..de6cc180692
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.2-r1.ebuild
@@ -0,0 +1,279 @@
+# 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="r1"
+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"
+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 )
+ 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
+
+ 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.9
+ 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)
+ $(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-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
+
+ # 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
+ 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-01-07 13:12 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-01-07 13:12 UTC (permalink / raw
To: gentoo-commits
commit: 9597fc49ea637dab3e2f77a436f462627939db45
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 13:12:13 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 13:12:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9597fc49
mail-client/mutt: revbump for latest patches from upstream
Package-Manager: Portage-2.3.13, Repoman-2.3.3
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.9.2-r1.ebuild => mutt-1.9.2-r2.ebuild} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1151ad46a03..a0098fcd405 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,4 +4,4 @@ DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b8
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
DIST mutt-gentoo-1.9.2-patches-r0.tar.xz 112224 BLAKE2B 7c5a5e67029e8c2775a1aeb876c5ee87c5616d748b08457364da07eccde5d3baecb328a95ef2fae7755be72b08d553d4beea08ccc751e146ce46694eac0c1f73 SHA512 b2ba382c21fe8d31059dd58760bba1ecd0b8fd256b3ade3d4dc0ea3dfa8c94e6ae9ec7baaf4b7c1c6c29d819fc78e9e781f07964478796e882903c0e9e438342
-DIST mutt-gentoo-1.9.2-patches-r1.tar.xz 113324 BLAKE2B a5ae4ca22001e91de8450086928bc7e3b26a26745d74f2969fb15e1f020037f8caffb92e0990dd9c8d13161afaa99c6cca593f8322f2870e413220447de20b3a SHA512 250323bb7b697ece97846f078f18ae93560f5ea5a8e1cedbc6d30ee21f3b430722e794d7a751ee4f9e673777ff39868c9c1e9dca4d4787b54240df7d981dbb39
+DIST mutt-gentoo-1.9.2-patches-r2.tar.xz 117216 BLAKE2B d0d562f4118fe88341fdf6d8b5fe25ce66e96568a951448e3b0c8a6016e1a2af6c38800661dd2a5adf727dfd66a051dac1c11d834077c2111ec49ffd24af8db0 SHA512 08a92e3a75277520e1e308081d95912e339d1f52cdf668a7fda77203a33e363f5f479533f68812366245d20b6be3333e7433fe6cb2c29438709b10ffd5640b41
diff --git a/mail-client/mutt/mutt-1.9.2-r1.ebuild b/mail-client/mutt/mutt-1.9.2-r2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.2-r1.ebuild
rename to mail-client/mutt/mutt-1.9.2-r2.ebuild
index de6cc180692..3d0dfb39c63 100644
--- a/mail-client/mutt/mutt-1.9.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r2"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-02-09 20:37 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-02-09 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 17a0530a3c0f35242131ec25d11d927153d61a21
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 20:37:23 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 20:37:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a0530a
mail-client/mutt: version bump and cleanup
Package-Manager: Portage-2.3.19, Repoman-2.3.6
mail-client/mutt/Manifest | 5 +-
mail-client/mutt/mutt-1.9.1-r4.ebuild | 274 ---------------------
.../mutt/{mutt-1.9.2.ebuild => mutt-1.9.3.ebuild} | 2 +-
3 files changed, 3 insertions(+), 278 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a0098fcd405..89bee03e919 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,7 +1,6 @@
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-DIST mutt-1.9.1.tar.gz 4193868 BLAKE2B 44623e3fd75e9f599daf044be54913944f894a5e05a8cb4e669c5d44e6bfab9caecbf0e0eb0fd6ebe0c0d177a141c78f1e837ad3059260e29326867c9db201b0 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095
DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b82ed8839530332eb699214ab2f3a3bf7f65c399ae663b12ca31c8d539b1e39915b2614c15168f0e3bda8be46 SHA512 3e35f3d27f1444bcee38e98fe62d41c7fa5b56ac9d5010b1c2cbf034c1e707491a09ccc7387b8d90d8c6c7150edf1d9093fec981d348cf9495313859d373b339
+DIST mutt-1.9.3.tar.gz 4196100 BLAKE2B d6f21ce6fb8ae666601113757d50bc1253a0e849bb4a5ddad6337d98dfc6441c2d519fd650ebda5129db07fb60910a61bb4be0d9c37163edd8dfeddc3c99461f SHA512 74be92fbad37f4517c55fabb86cf3bef35929e835877bd59daabc21b292a1e999aa3761df935e595a2226f9d30e256d1b828c11845cae10c60b72dc81e19e7cb
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
-DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
-DIST mutt-gentoo-1.9.2-patches-r0.tar.xz 112224 BLAKE2B 7c5a5e67029e8c2775a1aeb876c5ee87c5616d748b08457364da07eccde5d3baecb328a95ef2fae7755be72b08d553d4beea08ccc751e146ce46694eac0c1f73 SHA512 b2ba382c21fe8d31059dd58760bba1ecd0b8fd256b3ade3d4dc0ea3dfa8c94e6ae9ec7baaf4b7c1c6c29d819fc78e9e781f07964478796e882903c0e9e438342
DIST mutt-gentoo-1.9.2-patches-r2.tar.xz 117216 BLAKE2B d0d562f4118fe88341fdf6d8b5fe25ce66e96568a951448e3b0c8a6016e1a2af6c38800661dd2a5adf727dfd66a051dac1c11d834077c2111ec49ffd24af8db0 SHA512 08a92e3a75277520e1e308081d95912e339d1f52cdf668a7fda77203a33e363f5f479533f68812366245d20b6be3333e7433fe6cb2c29438709b10ffd5640b41
+DIST mutt-gentoo-1.9.3-patches-r0.tar.xz 113920 BLAKE2B 7ae47717d5f08192886de5c127d37c1014e69c22c65052fe58270377e947634b4be378ec91d8bb0aaf5c1e5eee98ad5e6f72192a8590fb437c23d1ddd047e24c SHA512 6166150f9d4f2a6e5ddd366a0276249d4a12fc499a24d31016508c94ae8d107bdfc44e43f081b8c803b98ab238650e2129ab3629608c479e5fb61651258a8242
diff --git a/mail-client/mutt/mutt-1.9.1-r4.ebuild b/mail-client/mutt/mutt-1.9.1-r4.ebuild
deleted file mode 100644
index 0cad65143c1..00000000000
--- a/mail-client/mutt/mutt-1.9.1-r4.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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 )
- 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
-
- 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=(
- # 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)
- $(use_enable sidebar)
-
- # 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)
- $(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-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
- 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
-}
diff --git a/mail-client/mutt/mutt-1.9.2.ebuild b/mail-client/mutt/mutt-1.9.3.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.2.ebuild
rename to mail-client/mutt/mutt-1.9.3.ebuild
index 03eefdb98a4..3a7a6fe7610 100644
--- a/mail-client/mutt/mutt-1.9.2.ebuild
+++ b/mail-client/mutt/mutt-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-02-10 9:39 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-02-10 9:39 UTC (permalink / raw
To: gentoo-commits
commit: eaa6a4b95744e787b44fda880d066c00bb9a7dd5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 09:39:00 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 09:39:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa6a4b9
mail-client/mutt: flea was removed, bug #647204
Closes: https://bugs.gentoo.org/647204
Package-Manager: Portage-2.3.19, Repoman-2.3.6
mail-client/mutt/mutt-1.9.3.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.3.ebuild b/mail-client/mutt/mutt-1.9.3.ebuild
index 3a7a6fe7610..ec439e84326 100644
--- a/mail-client/mutt/mutt-1.9.3.ebuild
+++ b/mail-client/mutt/mutt-1.9.3.ebuild
@@ -230,9 +230,8 @@ src_install() {
-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
+ 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 \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-02-10 15:26 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-02-10 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 9f702f98e2f275757dcce36d14387f3754405709
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 15:26:07 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 15:26:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f702f98
mail-client/mutt: add some || die()s, thanks jer, bug #647182
Bug: https://bugs.gentoo.org/647182
Package-Manager: Portage-2.3.19, Repoman-2.3.6
mail-client/mutt/mutt-1.9.3.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.3.ebuild b/mail-client/mutt/mutt-1.9.3.ebuild
index ec439e84326..8e0ba27771f 100644
--- a/mail-client/mutt/mutt-1.9.3.ebuild
+++ b/mail-client/mutt/mutt-1.9.3.ebuild
@@ -114,8 +114,7 @@ src_prepare() {
# 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"
+ sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
}
src_configure() {
@@ -229,8 +228,8 @@ src_install() {
-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/muttrc.man muttrc.5
+ 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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-03-10 14:58 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-03-10 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 35522e982f6b02756e12b51acd27fd7fff51d60c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 14:57:29 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 14:57:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35522e98
mail-client/mutt: version bump to 1.9.4, bug #650098
Closes: https://bugs.gentoo.org/650098
Package-Manager: Portage-2.3.19, Repoman-2.3.6
mail-client/mutt/Manifest | 3 +--
.../mutt/{mutt-1.9.2-r2.ebuild => mutt-1.9.4.ebuild} | 16 +++++++---------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 89bee03e919..65254f113f6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,5 @@
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b82ed8839530332eb699214ab2f3a3bf7f65c399ae663b12ca31c8d539b1e39915b2614c15168f0e3bda8be46 SHA512 3e35f3d27f1444bcee38e98fe62d41c7fa5b56ac9d5010b1c2cbf034c1e707491a09ccc7387b8d90d8c6c7150edf1d9093fec981d348cf9495313859d373b339
DIST mutt-1.9.3.tar.gz 4196100 BLAKE2B d6f21ce6fb8ae666601113757d50bc1253a0e849bb4a5ddad6337d98dfc6441c2d519fd650ebda5129db07fb60910a61bb4be0d9c37163edd8dfeddc3c99461f SHA512 74be92fbad37f4517c55fabb86cf3bef35929e835877bd59daabc21b292a1e999aa3761df935e595a2226f9d30e256d1b828c11845cae10c60b72dc81e19e7cb
+DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
-DIST mutt-gentoo-1.9.2-patches-r2.tar.xz 117216 BLAKE2B d0d562f4118fe88341fdf6d8b5fe25ce66e96568a951448e3b0c8a6016e1a2af6c38800661dd2a5adf727dfd66a051dac1c11d834077c2111ec49ffd24af8db0 SHA512 08a92e3a75277520e1e308081d95912e339d1f52cdf668a7fda77203a33e363f5f479533f68812366245d20b6be3333e7433fe6cb2c29438709b10ffd5640b41
DIST mutt-gentoo-1.9.3-patches-r0.tar.xz 113920 BLAKE2B 7ae47717d5f08192886de5c127d37c1014e69c22c65052fe58270377e947634b4be378ec91d8bb0aaf5c1e5eee98ad5e6f72192a8590fb437c23d1ddd047e24c SHA512 6166150f9d4f2a6e5ddd366a0276249d4a12fc499a24d31016508c94ae8d107bdfc44e43f081b8c803b98ab238650e2129ab3629608c479e5fb61651258a8242
diff --git a/mail-client/mutt/mutt-1.9.2-r2.ebuild b/mail-client/mutt/mutt-1.9.4.ebuild
similarity index 96%
rename from mail-client/mutt/mutt-1.9.2-r2.ebuild
rename to mail-client/mutt/mutt-1.9.4.ebuild
index 3d0dfb39c63..ba85cf1cf7a 100644
--- a/mail-client/mutt/mutt-1.9.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.9.4.ebuild
@@ -5,12 +5,12 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r2"
+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"
+MUTT_G_PATCHES="mutt-gentoo-1.9.3-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}"
@@ -72,7 +72,7 @@ RDEPEND="${CDEPEND}
"
src_prepare() {
- local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches
+ local PATCHDIR="${WORKDIR}"/mutt-gentoo-1.9.3-patches
if use !vanilla ; then
# apply patches
@@ -114,8 +114,7 @@ src_prepare() {
# 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"
+ sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
}
src_configure() {
@@ -229,10 +228,9 @@ src_install() {
-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
+ 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 \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-01 7:12 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-04-01 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 9d21d15760711027915b4b2b36d66be2b6ff8ed4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 07:11:58 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 07:11:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d21d157
mail-client/mutt: bump patchset for 1.9.4 for ncurses-6.1, bug #651552
Closes: https://bugs.gentoo.org/651552
Package-Manager: Portage-2.3.24, Repoman-2.3.6
mail-client/mutt/Manifest | 3 +-
.../{mutt-1.9.3.ebuild => mutt-1.9.4-r1.ebuild} | 2 +-
mail-client/mutt/mutt-1.9.4.ebuild | 277 ---------------------
3 files changed, 2 insertions(+), 280 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 65254f113f6..c26a77f5680 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,5 +1,4 @@
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-DIST mutt-1.9.3.tar.gz 4196100 BLAKE2B d6f21ce6fb8ae666601113757d50bc1253a0e849bb4a5ddad6337d98dfc6441c2d519fd650ebda5129db07fb60910a61bb4be0d9c37163edd8dfeddc3c99461f SHA512 74be92fbad37f4517c55fabb86cf3bef35929e835877bd59daabc21b292a1e999aa3761df935e595a2226f9d30e256d1b828c11845cae10c60b72dc81e19e7cb
DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
-DIST mutt-gentoo-1.9.3-patches-r0.tar.xz 113920 BLAKE2B 7ae47717d5f08192886de5c127d37c1014e69c22c65052fe58270377e947634b4be378ec91d8bb0aaf5c1e5eee98ad5e6f72192a8590fb437c23d1ddd047e24c SHA512 6166150f9d4f2a6e5ddd366a0276249d4a12fc499a24d31016508c94ae8d107bdfc44e43f081b8c803b98ab238650e2129ab3629608c479e5fb61651258a8242
+DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
diff --git a/mail-client/mutt/mutt-1.9.3.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.9.3.ebuild
rename to mail-client/mutt/mutt-1.9.4-r1.ebuild
index 8e0ba27771f..85ec9d834dc 100644
--- a/mail-client/mutt/mutt-1.9.3.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/mutt/mutt-1.9.4.ebuild b/mail-client/mutt/mutt-1.9.4.ebuild
deleted file mode 100644
index ba85cf1cf7a..00000000000
--- a/mail-client/mutt/mutt-1.9.4.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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-1.9.3-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"
-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 )
- 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-1.9.3-patches
-
- 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.9
- 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)
- $(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-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
-
- # 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 || 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
- 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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-06 16:08 Aaron Bauman
0 siblings, 0 replies; 249+ messages in thread
From: Aaron Bauman @ 2018-04-06 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 477be8918006a14fed672d0cab0f8ffd11c06303
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 6 16:08:07 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr 6 16:08:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477be891
mail-client/mutt: amd64 stable
Bug: https://bugs.gentoo.org/652668
Package-Manager: Portage-2.3.28, Repoman-2.3.9
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 85ec9d834dc..29950edf1eb 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-06 17:13 Tobias Klausmann
0 siblings, 0 replies; 249+ messages in thread
From: Tobias Klausmann @ 2018-04-06 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 9efb266fab9154ff8ec36247c8607bde38e86fc8
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 6 17:13:18 2018 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri Apr 6 17:13:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efb266f
mail-client/mutt-1.9.4-r1: alpha stable
Gentoo-Bug: http://bugs.gentoo.org/652668
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 29950edf1eb..158b60319d2 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-08 7:37 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-04-08 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 8a4e746cf27369d0840adaa5f17530a87999a0c7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 07:36:58 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 07:36:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4e746c
mail-client/mutt: drop exclusive req on backends, bug #607360
Closes: https://bugs.gentoo.org/607360
Package-Manager: Portage-2.3.24, Repoman-2.3.6
mail-client/mutt/mutt-1.9.4-r1.ebuild | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 158b60319d2..cf7b6e60ba9 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -15,8 +15,9 @@ 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 ) )
+ hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
imap? ( ssl )
pop? ( ssl )
nntp? ( ssl )
@@ -28,6 +29,8 @@ REQUIRED_USE="
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
@@ -171,13 +174,15 @@ src_configure() {
myconf+=( "--without-wc-funcs" )
fi
- # REQUIRED_USE should have selected only one of these
+ # 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=(
- "berkdb:bdb"
- "gdbm"
"lmdb"
"qdbm"
"tokyocabinet"
+ "gdbm"
+ "berkdb:bdb"
)
local ucache hcache lcache
for hcache in "${hcaches[@]}" ; do
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-08 8:53 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-04-08 8:53 UTC (permalink / raw
To: gentoo-commits
commit: b559ad9887bf0230dc026f10941f22f7766662d3
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Apr 8 08:51:53 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 08:53:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b559ad98
mail-client/mutt: stable 1.9.4-r1 for sparc
Bug: https://bugs.gentoo.org/652668
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index cf7b6e60ba9..3a03f9c5bfd 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-12 19:07 Thomas Deutschmann
0 siblings, 0 replies; 249+ messages in thread
From: Thomas Deutschmann @ 2018-04-12 19:07 UTC (permalink / raw
To: gentoo-commits
commit: cc69acdf4d984dfaff21bd3f6f1ecdd2056c50d5
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 18:59:35 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 19:06:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc69acdf
mail-client/mutt: x86 stable (bug #652668)
Package-Manager: Portage-2.3.28, Repoman-2.3.9
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 3a03f9c5bfd..601ebd6ad44 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-16 20:25 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-04-16 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 85408385d9d34a5cac6fea3f726c4318faeab756
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 16 20:25:06 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Apr 16 20:25:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85408385
mail-client/mutt: version bump to 1.9.5
Package-Manager: Portage-2.3.24, Repoman-2.3.6
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.9.5.ebuild | 282 +++++++++++++++++++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c26a77f5680..238a14f6d74 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
+DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
+DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
diff --git a/mail-client/mutt/mutt-1.9.5.ebuild b/mail-client/mutt/mutt-1.9.5.ebuild
new file mode 100644
index 00000000000..e6530450509
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.5.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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? ( || ( 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
+
+ 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 )
+ 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.9
+ 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)
+ $(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-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
+ 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-18 7:05 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-04-18 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 9e32a476a8690b9dec703ba19ace17c556f461a9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 07:03:40 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 07:04:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e32a476
mail-client/mutt: stable 1.9.4-r1 for ia64, bug #652668
Bug: https://bugs.gentoo.org/652668
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 601ebd6ad44..cfc5edd07dd 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-04-20 5:50 Mikle Kolyada
0 siblings, 0 replies; 249+ messages in thread
From: Mikle Kolyada @ 2018-04-20 5:50 UTC (permalink / raw
To: gentoo-commits
commit: e57d1bec9825e8be862388200e7ab2b136564b5a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 05:49:56 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 05:49:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57d1bec
mail-client/mutt: arm stable wrt bug #652668
Package-Manager: Portage-2.3.24, Repoman-2.3.6
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index cfc5edd07dd..b9615782bfd 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-05-23 14:35 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-05-23 14:35 UTC (permalink / raw
To: gentoo-commits
commit: db0af9d3afcd7043a392e145b82640655eef91a6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 14:34:40 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 23 14:34:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db0af9d3
mail-client/mutt: version bump to 1.10.0
Package-Manager: Portage-2.3.24, Repoman-2.3.6
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.10.0.ebuild | 282 ++++++++++++++++++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 238a14f6d74..326560071c6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
+DIST mutt-1.10.0.tar.gz 4249980 BLAKE2B eed788b0d0105d232cd0fbc50320fe4a3ef36635131e03cc477f0cf003c299b5d78994cb6467fcb6d45ca46a073c8997fdc42a669a3fa7662ac21ae70ae082c2 SHA512 4cade7f17e157c8c2184c96d596d9dbfab704d300074eca66c567f2dab055caa9b828080cce92e2616176000219288630c33542ab83a98db0160cd085b937530
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
+DIST mutt-gentoo-1.10.0-patches-r0.tar.xz 108556 BLAKE2B 9e8176816525c26922a6a8c0aa6efe9ce818e5a1fec8955ad5ac055fa7300d17401b41e56aa9b1366405c5ad13d2aa2e958bd48e9c6d0fc5ced40c162ae14818 SHA512 52d58aa50b289711487655cbf691b15f76e03d69fcfc655202126d94c57b574d643a3293408e930989a42c3b1e56ef398a32049e10a9ffc0331cffb57fde98e3
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
diff --git a/mail-client/mutt/mutt-1.10.0.ebuild b/mail-client/mutt/mutt-1.10.0.ebuild
new file mode 100644
index 00000000000..ad7fa6ac20c
--- /dev/null
+++ b/mail-client/mutt/mutt-1.10.0.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+
+ 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)
+ $(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-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
+ 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-05-25 4:28 Matt Turner
0 siblings, 0 replies; 249+ messages in thread
From: Matt Turner @ 2018-05-25 4:28 UTC (permalink / raw
To: gentoo-commits
commit: ff202a8a3b9ca59e878be9685f29d19a8dbef293
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 04:28:45 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 25 04:28:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff202a8a
mail-client/mutt-1.9.4-r1: ppc stable, bug 652668
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index b9615782bfd..a9c28a55ee5 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-05-25 4:28 Matt Turner
0 siblings, 0 replies; 249+ messages in thread
From: Matt Turner @ 2018-05-25 4:28 UTC (permalink / raw
To: gentoo-commits
commit: a26f449008c2f4096a03055aae94b62620223f6b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 04:28:48 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 25 04:28:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26f4490
mail-client/mutt-1.9.4-r1: ppc64 stable, bug 652668
mail-client/mutt/mutt-1.9.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index a9c28a55ee5..54254b5b37a 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-16 18:34 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-07-16 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 508f3323bbd3a375fd8aeae0ed18f347283fac3e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 18:33:43 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 18:34:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508f3323
mail-client/mutt: security bump 1.10.1
Package-Manager: Portage-2.3.40, Repoman-2.3.9
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.10.0.ebuild => mutt-1.10.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 326560071c6..731e6631085 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,8 @@
-DIST mutt-1.10.0.tar.gz 4249980 BLAKE2B eed788b0d0105d232cd0fbc50320fe4a3ef36635131e03cc477f0cf003c299b5d78994cb6467fcb6d45ca46a073c8997fdc42a669a3fa7662ac21ae70ae082c2 SHA512 4cade7f17e157c8c2184c96d596d9dbfab704d300074eca66c567f2dab055caa9b828080cce92e2616176000219288630c33542ab83a98db0160cd085b937530
+DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
-DIST mutt-gentoo-1.10.0-patches-r0.tar.xz 108556 BLAKE2B 9e8176816525c26922a6a8c0aa6efe9ce818e5a1fec8955ad5ac055fa7300d17401b41e56aa9b1366405c5ad13d2aa2e958bd48e9c6d0fc5ced40c162ae14818 SHA512 52d58aa50b289711487655cbf691b15f76e03d69fcfc655202126d94c57b574d643a3293408e930989a42c3b1e56ef398a32049e10a9ffc0331cffb57fde98e3
+DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
diff --git a/mail-client/mutt/mutt-1.10.0.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.10.0.ebuild
rename to mail-client/mutt/mutt-1.10.1.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-19 10:07 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2018-07-19 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 4466623b4435ff47e7f1e7a5fc8cb86e173548d9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 10:07:42 2018 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 10:07:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4466623b
mail-client/mutt: amd64 stable wrt bug #661436
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index ad7fa6ac20c..7bbd2df1068 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-19 20:15 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-07-19 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 93bce19a0929127a24610120482b690147eee6af
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Jul 19 19:37:50 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 20:15:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93bce19a
mail-client/mutt: stable 1.10.1 for sparc
Bug: https://bugs.gentoo.org/661436
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 7bbd2df1068..f264d6abb01 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-20 8:08 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-07-20 8:08 UTC (permalink / raw
To: gentoo-commits
commit: edfd9e96e510e03f350a2aff75c366ca96c69e9b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 08:02:02 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 08:07:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfd9e96
mail-client/mutt: stable 1.10.1 for ia64, bug #661436
Bug: https://bugs.gentoo.org/661436
Package-Manager: Portage-2.3.43, Repoman-2.3.10
RepoMan-Options: --include-arches="ia64"
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index f264d6abb01..07570fadd47 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-20 22:40 Thomas Deutschmann
0 siblings, 0 replies; 249+ messages in thread
From: Thomas Deutschmann @ 2018-07-20 22:40 UTC (permalink / raw
To: gentoo-commits
commit: a7dfb121c338366b64cf719e783cb3720323cc6d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 22:35:44 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 22:35:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7dfb121
mail-client/mutt: x86 stable (bug #661436)
Package-Manager: Portage-2.3.43, Repoman-2.3.10
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 07570fadd47..9d6073d9da4 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-20 22:48 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-07-20 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 498e282df1cc634e75d4e19cce9fca5343f187cf
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 22:47:35 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 22:47:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498e282d
mail-client/mutt: stable 1.10.1 for ppc64, bug #661436
Bug: https://bugs.gentoo.org/661436
Package-Manager: Portage-2.3.43, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 9d6073d9da4..9aaba6d4d0f 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-22 9:01 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-07-22 9:01 UTC (permalink / raw
To: gentoo-commits
commit: 647a0e4f10e8972115d196e0e0e17e56f5f7eadc
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Jul 22 08:40:41 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 09:00:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647a0e4f
mail-client/mutt: stable 1.10.1 for hppa
Bug: https://bugs.gentoo.org/661436
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="hppa"
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 9aaba6d4d0f..0449c81d040 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-22 19:41 Mikle Kolyada
0 siblings, 0 replies; 249+ messages in thread
From: Mikle Kolyada @ 2018-07-22 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 87ed59da847ea0048fcb49c48f3f89560f17a53d
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 19:41:19 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 19:41:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ed59da
mail-client/mutt: arm stable wrt bug #661436
Package-Manager: Portage-2.3.40, Repoman-2.3.9
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 0449c81d040..819596053c2 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-07-23 8:24 Tobias Klausmann
0 siblings, 0 replies; 249+ messages in thread
From: Tobias Klausmann @ 2018-07-23 8:24 UTC (permalink / raw
To: gentoo-commits
commit: a3d24839ab074bc36533e452abc066443425b3a1
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 08:24:39 2018 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 08:24:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d24839
mail-client/mutt-1.10.1-r0: alpha stable
Gentoo-Bug: http://bugs.gentoo.org/661436
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 819596053c2..2083875400f 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-08-14 16:02 Alon Bar-Lev
0 siblings, 0 replies; 249+ messages in thread
From: Alon Bar-Lev @ 2018-08-14 16:02 UTC (permalink / raw
To: gentoo-commits
commit: 63f06ebed3cd4e1237de736fee0aedd9932dc1b6
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 14 15:57:35 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Tue Aug 14 16:02:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f06ebe
mail-client/mutt: drop stable hppa to drop old app-crypt/gpgme
Package-Manager: Portage-2.3.40, Repoman-2.3.9
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
mail-client/mutt/mutt-1.7.2.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 2083875400f..577cba9df1a 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
index d56830813aa..fd2e6074ae2 100644
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
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"
+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
nls? ( virtual/libintl )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-09-08 20:25 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2018-09-08 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 034748489c501c161ad04995a2c591d687dc7189
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 20:25:11 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 8 20:25:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03474848
mail-client/mutt: stable 1.10.1 for ppc, bug #661436
Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc"
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 577cba9df1a..fbd14407b22 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-09-19 2:57 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-09-19 2:57 UTC (permalink / raw
To: gentoo-commits
commit: e4e0488927a6fbd7e967cd608d71ac578a82729e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 19 02:56:23 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 02:57:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e04889
mail-client/mutt: revbump with fix for nntp crash
Package-Manager: Portage-2.3.40.3-prefix, Repoman-2.3.9
mail-client/mutt/Manifest | 1 +
mail-client/mutt/mutt-1.10.1-r1.ebuild | 282 +++++++++++++++++++++++++++++++++
2 files changed, 283 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 731e6631085..bbe31a8f1e7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,6 +3,7 @@ DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590da
DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
+DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
diff --git a/mail-client/mutt/mutt-1.10.1-r1.ebuild b/mail-client/mutt/mutt-1.10.1-r1.ebuild
new file mode 100644
index 00000000000..c23817e7155
--- /dev/null
+++ b/mail-client/mutt/mutt-1.10.1-r1.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r1"
+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
+
+ 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)
+ $(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-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
+ 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-10-31 9:01 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-10-31 9:01 UTC (permalink / raw
To: gentoo-commits
commit: 168b6360ba1239eac10847d1adce53af9ed17057
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 31 08:57:05 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 08:57:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168b6360
mail-client/mutt: cleanup vulnerable versions, bug #661436
Bug: https://bugs.gentoo.org/661436
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
mail-client/mutt/Manifest | 6 -
mail-client/mutt/metadata.xml | 1 -
mail-client/mutt/mutt-1.7.2.ebuild | 274 ---------------------------------
mail-client/mutt/mutt-1.9.4-r1.ebuild | 282 ----------------------------------
mail-client/mutt/mutt-1.9.5.ebuild | 282 ----------------------------------
5 files changed, 845 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index bbe31a8f1e7..23346c10d91 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,9 +1,3 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
-DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
-DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
-DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
-DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
-DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
-DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index f4506027293..d3151fec669 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -19,7 +19,6 @@
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>
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
deleted file mode 100644
index fd2e6074ae2..00000000000
--- a/mail-client/mutt/mutt-1.7.2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r1"
-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 idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
-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
- nls? ( virtual/libintl )
- tokyocabinet? ( dev-db/tokyocabinet )
- !tokyocabinet? (
- qdbm? ( dev-db/qdbm )
- !qdbm? (
- gdbm? ( sys-libs/gdbm )
- !gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
- )
- )
- imap? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- kerberos? ( virtual/krb5 )
- pop? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- smtp? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- )
- idn? ( net-dns/libidn )
- gpg? ( >=app-crypt/gpgme-0.9.0:= )
- smime? (
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- libressl? ( dev-libs/libressl:= )
- )
- 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}"/gentoo-mutt-${PV}-patches
-
- if use !vanilla ; then
- # apply patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- local patches=(
- patches-mutt
- bugs-gentoo
- features-common
- features-extra
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- 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 debug)"
- "$(use_enable doc)"
- "$(use_enable gpg gpgme)"
- "$(use_enable imap)"
- "$(use_enable nls)"
- "$(use_enable nntp)"
- "$(use_enable pop)"
- "$(use_enable sidebar)"
- "$(use_enable smime)"
- "$(use_enable smtp)"
- "$(use_enable notmuch)"
- "$(use_with idn)"
- "$(use_with kerberos gss)"
- "--with-$(use slang && echo slang || echo 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
-
- # mutt prioritizes gdbm over bdb, so we will too.
- # hcache feature requires at least one database is in USE.
- local hcaches=(
- "tokyocabinet"
- "qdbm"
- "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
-
- # there's no need for gnutls, ssl or sasl without socket support
- if use pop || use imap || use smtp ; then
- if use gnutls; then
- myconf+=( "--with-gnutls" )
- elif use ssl; then
- myconf+=( "--with-ssl" )
- fi
- # not sure if this should be mutually exclusive with the other two
- myconf+=( "$(use_with sasl)" )
- else
- myconf+=(
- "--without-gnutls"
- "--without-ssl"
- "--without-sasl"
- )
- fi
-
- 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 /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
-}
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
deleted file mode 100644
index 54254b5b37a..00000000000
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r1"
-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? ( || ( 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
-
- 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 )
- 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
-
- 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.9
- 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)
- $(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-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
- 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
-}
diff --git a/mail-client/mutt/mutt-1.9.5.ebuild b/mail-client/mutt/mutt-1.9.5.ebuild
deleted file mode 100644
index e6530450509..00000000000
--- a/mail-client/mutt/mutt-1.9.5.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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? ( || ( 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
-
- 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 )
- 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.9
- 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)
- $(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-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
- 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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-11-27 12:34 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-11-27 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 2481db74fa33cd95a8bde14529c8afbec14479f7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 12:33:45 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 12:34:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2481db74
mail-client/mutt: version bump to 1.11.0
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.11.0.ebuild | 282 ++++++++++++++++++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 23346c10d91..f5419514e41 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,3 +1,5 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
+DIST mutt-1.11.0.tar.gz 4568953 BLAKE2B 1875290c9749addbf7813257901c52f0434581dfd5e15888370e8b6784a15c547d27e5c7ae4f6dfc99040be3f07ae87794d2eb17883b0cec4fcd0b4f21daeafc SHA512 1aa26deee563eee63bf8eb7116dbf7d5a796f5c8b5233ccdaf050188186b08fe1de948316cede5059375128b5771095b895e4113ac4f5549ced4aa83c6fa0c54
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
+DIST mutt-gentoo-1.11.0-patches-r0.tar.xz 108760 BLAKE2B d68036f47bc32eef2e99297fbb38c6b2c9a678eae298f1fdb68d15fe6fc20f5aa3efe86ab9646e9fad4334c02050212b0dfbe8c9de5bba9f855ae28afcf1e205 SHA512 4cab228b68e148c87c9283b660e1ee1e0fc3b5ec890dd96b41d6a557f58fb221be24aa27a999f874fe8c2026cccc138a1a8ee066c4076cb74778cef101c4f327
diff --git a/mail-client/mutt/mutt-1.11.0.ebuild b/mail-client/mutt/mutt-1.11.0.ebuild
new file mode 100644
index 00000000000..84e3dc40704
--- /dev/null
+++ b/mail-client/mutt/mutt-1.11.0.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2018 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
+
+ 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)
+ $(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-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
+ 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2018-12-02 18:16 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2018-12-02 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 75ebb2b5733c505017cb982f5b42e8d820752fa2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 18:16:37 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 18:16:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ebb2b5
mail-client/mutt: version bump to 1.11.1 (imap fixes)
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.11.0.ebuild => mutt-1.11.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f5419514e41..3127325fb82 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,5 +1,5 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
-DIST mutt-1.11.0.tar.gz 4568953 BLAKE2B 1875290c9749addbf7813257901c52f0434581dfd5e15888370e8b6784a15c547d27e5c7ae4f6dfc99040be3f07ae87794d2eb17883b0cec4fcd0b4f21daeafc SHA512 1aa26deee563eee63bf8eb7116dbf7d5a796f5c8b5233ccdaf050188186b08fe1de948316cede5059375128b5771095b895e4113ac4f5549ced4aa83c6fa0c54
+DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
-DIST mutt-gentoo-1.11.0-patches-r0.tar.xz 108760 BLAKE2B d68036f47bc32eef2e99297fbb38c6b2c9a678eae298f1fdb68d15fe6fc20f5aa3efe86ab9646e9fad4334c02050212b0dfbe8c9de5bba9f855ae28afcf1e205 SHA512 4cab228b68e148c87c9283b660e1ee1e0fc3b5ec890dd96b41d6a557f58fb221be24aa27a999f874fe8c2026cccc138a1a8ee066c4076cb74778cef101c4f327
+DIST mutt-gentoo-1.11.1-patches-r0.tar.xz 108864 BLAKE2B 22d2fca8395ad0a6aaec8c2ede7acd011408df5c2d71ece29077355ee83ad694440286793f609734b2231e7ce8f9f785ad9f4a3ba8045670971e59addeec7c3e SHA512 ba6923ed11b3d92a71a93e6bb296083648f32fbb0801faa0ac1d4f1ea0fd97fa65eb1abd057bd231f55b7896838c03cd981564ccad0376f38be0a4ce264723be
diff --git a/mail-client/mutt/mutt-1.11.0.ebuild b/mail-client/mutt/mutt-1.11.1.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.11.0.ebuild
rename to mail-client/mutt/mutt-1.11.1.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-01-02 10:54 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-01-02 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 3df596d62c4acc8e63139433ac8241b93931bd8a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 2 10:54:07 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 2 10:54:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df596d6
mail-client/mutt: revbump to fix some patches
Bug: https://bugs.gentoo.org/674176
Bug: https://bugs.gentoo.org/674202
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.11.1.ebuild => mutt-1.11.1-r1.ebuild} | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 3127325fb82..5ac1d083968 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,4 +2,4 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
-DIST mutt-gentoo-1.11.1-patches-r0.tar.xz 108864 BLAKE2B 22d2fca8395ad0a6aaec8c2ede7acd011408df5c2d71ece29077355ee83ad694440286793f609734b2231e7ce8f9f785ad9f4a3ba8045670971e59addeec7c3e SHA512 ba6923ed11b3d92a71a93e6bb296083648f32fbb0801faa0ac1d4f1ea0fd97fa65eb1abd057bd231f55b7896838c03cd981564ccad0376f38be0a4ce264723be
+DIST mutt-gentoo-1.11.1-patches-r1.tar.xz 107112 BLAKE2B ac438b904cc265fc84ce25d0681f80fb1300e32674de983aa1d298de18e70b58c4300da2c5f14c8f86bfeb275f15722e41192975b11c3c9e7c8c64fca8340918 SHA512 c89353e91227c3598b833657bddcc36da8ad3d5b5cd2f3249ced720b7583cb801cf4e7d3b60c24daed555ce9cd07bd0e6d79a41ea84624b74c49bc9d33217741
diff --git a/mail-client/mutt/mutt-1.11.1.ebuild b/mail-client/mutt/mutt-1.11.1-r1.ebuild
similarity index 97%
rename from mail-client/mutt/mutt-1.11.1.ebuild
rename to mail-client/mutt/mutt-1.11.1-r1.ebuild
index 84e3dc40704..59cd6481692 100644
--- a/mail-client/mutt/mutt-1.11.1.ebuild
+++ b/mail-client/mutt/mutt-1.11.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
@@ -257,6 +257,10 @@ pkg_postinst() {
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."
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-01-04 10:52 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2019-01-04 10:52 UTC (permalink / raw
To: gentoo-commits
commit: ed8eceff3a72cb6112f82aa78d04dad01a219882
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 10:49:40 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 10:51:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed8eceff
mail-client/mutt: restore stable hppa for 1.10.1
Reverts 63f06ebed3cd4e1237de736fee0aedd9932dc1b6 commit.
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-1.10.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index fbd14407b22..2dd27636988 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-01-05 19:21 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-01-05 19:21 UTC (permalink / raw
To: gentoo-commits
commit: f97318bf584338942189c99c8d5a2887ac8f57cc
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 19:20:35 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 19:20:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97318bf
mail-client/mutt: fix compilation with -imap/notmuch
Closes: https://bugs.gentoo.org/674492
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.11.1-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 5ac1d083968..878c42a91a6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,4 +2,4 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
-DIST mutt-gentoo-1.11.1-patches-r1.tar.xz 107112 BLAKE2B ac438b904cc265fc84ce25d0681f80fb1300e32674de983aa1d298de18e70b58c4300da2c5f14c8f86bfeb275f15722e41192975b11c3c9e7c8c64fca8340918 SHA512 c89353e91227c3598b833657bddcc36da8ad3d5b5cd2f3249ced720b7583cb801cf4e7d3b60c24daed555ce9cd07bd0e6d79a41ea84624b74c49bc9d33217741
+DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
diff --git a/mail-client/mutt/mutt-1.11.1-r1.ebuild b/mail-client/mutt/mutt-1.11.1-r1.ebuild
index 59cd6481692..1907b053b7f 100644
--- a/mail-client/mutt/mutt-1.11.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.11.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r2"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-01-06 20:42 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-01-06 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 89625734e2102b1e2f7f76532321e0cd76941150
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 20:42:09 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 20:42:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89625734
mail-client/mutt: fix dependencies for USE=idn, thanks jer
Closes: https://bugs.gentoo.org/674682
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/{mutt-1.11.1-r1.ebuild => mutt-1.11.1-r2.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.11.1-r1.ebuild b/mail-client/mutt/mutt-1.11.1-r2.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-1.11.1-r1.ebuild
rename to mail-client/mutt/mutt-1.11.1-r2.ebuild
index 1907b053b7f..9471fe0aa43 100644
--- a/mail-client/mutt/mutt-1.11.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.11.1-r2.ebuild
@@ -33,6 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
# 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 )
@@ -153,13 +154,14 @@ src_configure() {
$(use !ssl && echo --without-gnutls --without-ssl)
$(use_with sasl)
- $(use_with idn)
+ $(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}"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-01-08 8:48 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-01-08 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 7f9e8eeb45ae256dd310b44fcaa97129f858afd5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 08:47:39 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 08:47:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9e8eeb
mail-client/mutt: version bump to v1.11.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 3 ++-
.../mutt/{mutt-1.10.1-r1.ebuild => mutt-1.11.2.ebuild} | 12 +++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 878c42a91a6..cc05b29cf8b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,5 +1,6 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
+DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
-DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
+DIST mutt-gentoo-1.11.2-patches-r0.tar.xz 107164 BLAKE2B 8e48c25bbd8f8dc498e5acdf4cdfb787c1aa154c56b5a27da9e20168ffea07de842a7d2dd223b4a98e55d0a005798c6dae7ae578f80a6b50014224bebd8378ff SHA512 9b592136fc8c329aa926ee480c6c16d4863ecfd4c9b1fed0a1cf748413ba849739a7e7986024a91b9383db7451befb9fa58392cda10126ec712a1ba4b0aa952b
diff --git a/mail-client/mutt/mutt-1.10.1-r1.ebuild b/mail-client/mutt/mutt-1.11.2.ebuild
similarity index 96%
rename from mail-client/mutt/mutt-1.10.1-r1.ebuild
rename to mail-client/mutt/mutt-1.11.2.ebuild
index c23817e7155..e7a091241ec 100644
--- a/mail-client/mutt/mutt-1.10.1-r1.ebuild
+++ b/mail-client/mutt/mutt-1.11.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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="r1"
+PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
@@ -33,6 +33,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
# 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 )
@@ -153,13 +154,14 @@ src_configure() {
$(use !ssl && echo --without-gnutls --without-ssl)
$(use_with sasl)
- $(use_with idn)
+ $(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}"
@@ -257,6 +259,10 @@ pkg_postinst() {
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."
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-01-10 18:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-01-10 18:05 UTC (permalink / raw
To: gentoo-commits
commit: a87386799c1a1df482a9fc6cf27ed19379b3ef2c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 18:05:30 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 18:05:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8738679
mail-client/mutt: get libressl fix from upstream
Closes: https://bugs.gentoo.org/674898
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.11.2.ebuild => mutt-1.11.2-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cc05b29cf8b..7e9dc710946 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,4 +3,4 @@ DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693
DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
-DIST mutt-gentoo-1.11.2-patches-r0.tar.xz 107164 BLAKE2B 8e48c25bbd8f8dc498e5acdf4cdfb787c1aa154c56b5a27da9e20168ffea07de842a7d2dd223b4a98e55d0a005798c6dae7ae578f80a6b50014224bebd8378ff SHA512 9b592136fc8c329aa926ee480c6c16d4863ecfd4c9b1fed0a1cf748413ba849739a7e7986024a91b9383db7451befb9fa58392cda10126ec712a1ba4b0aa952b
+DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e
diff --git a/mail-client/mutt/mutt-1.11.2.ebuild b/mail-client/mutt/mutt-1.11.2-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.11.2.ebuild
rename to mail-client/mutt/mutt-1.11.2-r1.ebuild
index e7a091241ec..a33f730ccdb 100644
--- a/mail-client/mutt/mutt-1.11.2.ebuild
+++ b/mail-client/mutt/mutt-1.11.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-02-02 12:46 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-02-02 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 2c66463afb7ea86aa83b939156308622bc09a110
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 2 12:46:11 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb 2 12:46:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c66463a
mail-client/mutt: version bump to 1.11.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.11.3.ebuild | 288 ++++++++++++++++++++++++++++++++++++
2 files changed, 290 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 7e9dc710946..fcd5db38e41 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
+DIST mutt-1.11.3.tar.gz 4581196 BLAKE2B 12f7a067bdfab72628e3fd25e9391d252c8665db845963df5c4a8f66f7d68ce1385e94fd35527718fdbedc9759910e2ee7253430ecddb8ea92f6368078be9a03 SHA512 381079254f01cdd85b9e556a10bb1ddf0b49d96b54fe21d70dd735199dcbbfd46956ad85201fe8a4e8cdf7bdb121664c7b4edc0659da6b14dc8eaf6adf9827df
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e
+DIST mutt-gentoo-1.11.3-patches-r0.tar.xz 107172 BLAKE2B bb82a95baf3fe5af191d5da7bd56d0f51d43a390be08442c945515330fd11d5d3a0c2893a5a595ea8a23421ec5ea79aa36a05e46ce71d449c28193b819154c9b SHA512 2d1579f03876398eb793548b31fe8bfc15d226651334dfe07a65eff45ab777eebaae66d85dd0a59e05649ae0924fdb45cfced438eb0dff9742bc13b1fb1ae671
diff --git a/mail-client/mutt/mutt-1.11.3.ebuild b/mail-client/mutt/mutt-1.11.3.ebuild
new file mode 100644
index 00000000000..e7a091241ec
--- /dev/null
+++ b/mail-client/mutt/mutt-1.11.3.ebuild
@@ -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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-03-13 14:12 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-03-13 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 1ef9201cbd8a249088ad62b839dd86fff8692678
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 12:51:24 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 14:11:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef9201c
mail-client/mutt: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
mail-client/mutt/Manifest | 6 +-
mail-client/mutt/mutt-1.11.2-r1.ebuild | 288 ---------------------
.../{mutt-1.11.1-r2.ebuild => mutt-1.11.4.ebuild} | 2 +-
3 files changed, 3 insertions(+), 293 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index fcd5db38e41..a58b710e0ac 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,6 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
-DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
-DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
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-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
-DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
-DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e
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
diff --git a/mail-client/mutt/mutt-1.11.2-r1.ebuild b/mail-client/mutt/mutt-1.11.2-r1.ebuild
deleted file mode 100644
index a33f730ccdb..00000000000
--- a/mail-client/mutt/mutt-1.11.2-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# 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="r1"
-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
-}
diff --git a/mail-client/mutt/mutt-1.11.1-r2.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.11.1-r2.ebuild
rename to mail-client/mutt/mutt-1.11.4.ebuild
index 9471fe0aa43..e7a091241ec 100644
--- a/mail-client/mutt/mutt-1.11.1-r2.ebuild
+++ b/mail-client/mutt/mutt-1.11.4.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r2"
+PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-05-29 14:03 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-05-29 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 9a6ab111fda5aba8b62f461b240744cf314022c5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 14:02:54 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 29 14:03:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6ab111
mail-client/mutt: version bump to 1.12.0
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.12.0.ebuild | 288 ++++++++++++++++++++++++++++++++++++
2 files changed, 290 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a58b710e0ac..1528eb41dbb 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
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-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
diff --git a/mail-client/mutt/mutt-1.12.0.ebuild b/mail-client/mutt/mutt-1.12.0.ebuild
new file mode 100644
index 00000000000..e7a091241ec
--- /dev/null
+++ b/mail-client/mutt/mutt-1.12.0.ebuild
@@ -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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-06-17 17:13 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-06-17 17:13 UTC (permalink / raw
To: gentoo-commits
commit: a3d095a20db517967389cc7a126528cf345ae613
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 17:12:52 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 17:13:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d095a2
mail-client/mutt: version bump 1.12.1
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.12.1.ebuild | 288 ++++++++++++++++++++++++++++++++++++
2 files changed, 290 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1528eb41dbb..bdd92c71b56 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -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
index 00000000000..e7a091241ec
--- /dev/null
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-08-11 8:45 Michał Górny
0 siblings, 0 replies; 249+ messages in thread
From: Michał Górny @ 2019-08-11 8:45 UTC (permalink / raw
To: gentoo-commits
commit: fccbb74c583ec08278426819e4f6640e6ed40f89
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 08:43:01 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 08:45:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fccbb74c
mail-client/mutt: Remove duplicated global flag desc
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
mail-client/mutt/metadata.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index a11ea3c2f29..d3cb60f1c32 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -18,8 +18,6 @@
<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>
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-09-15 15:37 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-09-15 15:37 UTC (permalink / raw
To: gentoo-commits
commit: ce0d8617e3345ecaaf62655324b8afecfd95100a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 15:31:26 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 15:35:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce0d8617
mail-client/mutt: restrict USE=vanilla with nntp or notmuch
Closes: https://bugs.gentoo.org/694486
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-1.12.1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index e7a091241ec..6c1d31ab1ce 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -25,7 +25,8 @@ REQUIRED_USE="
smime_classic? ( ssl !gnutls )
smtp? ( ssl sasl )
sasl? ( || ( imap pop smtp nntp ) )
- kerberos? ( || ( imap pop smtp nntp ) )"
+ kerberos? ( || ( imap pop smtp nntp ) )
+ vanilla? ( !nntp !notmuch )"
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"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-09-26 7:45 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-09-26 7:45 UTC (permalink / raw
To: gentoo-commits
commit: a3476d8903aa706a00db0998279ce97256f33169
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 07:44:52 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 07:45:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3476d89
mail-client/mutt: version bump to 1.12.2
Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.17
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 6 +-
mail-client/mutt/mutt-1.12.0.ebuild | 288 ---------------------
.../{mutt-1.11.3.ebuild => mutt-1.12.2.ebuild} | 3 +-
3 files changed, 4 insertions(+), 293 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index bdd92c71b56..171e7a358e2 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,8 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
-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-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
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
+DIST mutt-gentoo-1.12.2-patches-r0.tar.xz 106384 BLAKE2B 9329c3629d4c8d34e42a422e76dc0ec0f3a4b697fc59586c0258716bb9e4a1ff26cccc20f7ecbc340a92e23b24baa7514041274b3b2b4a73ef9dd36536d8206a SHA512 0aafa589a98e10044a36e578cae5e1e08ae66a0fe773763852441d9410f65f8bf6bd0256e1b0f059bd5ace6fb7ed90f63b5c3dd4b6fbdb6e7c3d2af8a95b266f
diff --git a/mail-client/mutt/mutt-1.12.0.ebuild b/mail-client/mutt/mutt-1.12.0.ebuild
deleted file mode 100644
index e7a091241ec..00000000000
--- a/mail-client/mutt/mutt-1.12.0.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# 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
-}
diff --git a/mail-client/mutt/mutt-1.11.3.ebuild b/mail-client/mutt/mutt-1.12.2.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.11.3.ebuild
rename to mail-client/mutt/mutt-1.12.2.ebuild
index e7a091241ec..6c1d31ab1ce 100644
--- a/mail-client/mutt/mutt-1.11.3.ebuild
+++ b/mail-client/mutt/mutt-1.12.2.ebuild
@@ -25,7 +25,8 @@ REQUIRED_USE="
smime_classic? ( ssl !gnutls )
smtp? ( ssl sasl )
sasl? ( || ( imap pop smtp nntp ) )
- kerberos? ( || ( imap pop smtp nntp ) )"
+ kerberos? ( || ( imap pop smtp nntp ) )
+ vanilla? ( !nntp !notmuch )"
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"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-10-31 12:44 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-10-31 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 33ed451b2371a466150669b4f600590f59d75e18
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 12:44:07 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 12:44:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ed451b
mail-client/mutt: revbump 1.12.2 for Outlook charset patch
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/{mutt-1.12.2.ebuild => mutt-1.12.2-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 171e7a358e2..0ff5222a6cd 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,4 +5,4 @@ DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
-DIST mutt-gentoo-1.12.2-patches-r0.tar.xz 106384 BLAKE2B 9329c3629d4c8d34e42a422e76dc0ec0f3a4b697fc59586c0258716bb9e4a1ff26cccc20f7ecbc340a92e23b24baa7514041274b3b2b4a73ef9dd36536d8206a SHA512 0aafa589a98e10044a36e578cae5e1e08ae66a0fe773763852441d9410f65f8bf6bd0256e1b0f059bd5ace6fb7ed90f63b5c3dd4b6fbdb6e7c3d2af8a95b266f
+DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
diff --git a/mail-client/mutt/mutt-1.12.2.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.12.2.ebuild
rename to mail-client/mutt/mutt-1.12.2-r1.ebuild
index 9f35aa2497e..ddd2e3013ea 100644
--- a/mail-client/mutt/mutt-1.12.2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-11-03 10:21 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-11-03 10:21 UTC (permalink / raw
To: gentoo-commits
commit: f1e4c489f5cccac3303a9dab40b2be290a618fb2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 10:20:58 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 10:21:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e4c489
mail-client/mutt-1.12.2-r2: revbump with USE-flag rename for bug 695078
Bug: https://bugs.gentoo.org/695078
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/metadata.xml | 8 +-
mail-client/mutt/mutt-1.12.2-r2.ebuild | 272 +++++++++++++++++++++++++++++++++
2 files changed, 276 insertions(+), 4 deletions(-)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index d3cb60f1c32..3c947815701 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -20,18 +20,18 @@
database backend for header caching</flag>
<flag name="pgp_classic">Build classic_pgp backend to support PGP/MIME
and traditional/inline PGP</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>
+ <flag name="smime-classic">Build classic_smime backend to support
+ S/MIME</flag>
</use>
<upstream>
- <!-- for releases before 1.9.2 -->
- <remote-id type="sourceforge">mutt</remote-id>
- <remote-id type="bitbucket">mutt/mutt</remote-id>
- <!-- from 1.9.2 onwards -->
<remote-id type="gitlab">muttmua/mutt</remote-id>
</upstream>
</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
new file mode 100644
index 00000000000..06de6bae9ad
--- /dev/null
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -0,0 +1,272 @@
+# 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="r1"
+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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pgp-classic pop qdbm +sasl selinux slang smime_classic 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_classic? ( ssl !gnutls )
+ smtp? ( ssl sasl )
+ sasl? ( || ( imap pop smtp nntp ) )
+ kerberos? ( || ( imap pop smtp nntp ) )
+ vanilla? ( !nntp !notmuch )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ 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_classic? ( || ( dev-libs/libressl >=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
+ 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 pgp_classic && use_enable pgp_classic pgp)
+ $(use pgp-classic && use_enable pgp-classic pgp)
+ $(use !pgp_classic && use !pgp-classic && echo "--disable-pgp")
+
+ $(use smime_classic && use_enable smime_classic smime)
+ $(use smime-classic && use_enable smime-classic smime)
+ $(use !smime_classic && use !smime-classic && echo "--disable-smime")
+
+ $(use_enable 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
+ fi
+ if use gpg_classic || use smime_classic ; then
+ ewarn "Please note that crypto related USE-flags of mutt have changed."
+ ewarn "To compile to PMS, the following USE-flags are renamed:"
+ ewarn "(see https://bugs.gentoo.org/695078)"
+ ewarn " pgp_classic -> pgp-classic"
+ ewarn " smime_classic -> 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"
+ 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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-11-03 13:47 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-11-03 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 52628a5792544b139f76f10dacf544a5511b7215
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 3 13:47:13 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 13:47:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52628a57
mail-client/mutt-1.12.2-r2: fix USE-flag name, thanks toralf, bug #699230,
Closes: https://bugs.gentoo.org/699230
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-1.12.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
index 06de6bae9ad..94df0e4f961 100644
--- a/mail-client/mutt/mutt-1.12.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -255,7 +255,7 @@ pkg_postinst() {
elog " https://wiki.gentoo.org/wiki/Mutt"
echo
fi
- if use gpg_classic || use smime_classic ; then
+ if use pgp_classic || use smime_classic ; then
ewarn "Please note that crypto related USE-flags of mutt have changed."
ewarn "To compile to PMS, the following USE-flags are renamed:"
ewarn "(see https://bugs.gentoo.org/695078)"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-11-04 18:59 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-11-04 18:59 UTC (permalink / raw
To: gentoo-commits
commit: ccc3e350f7ef569c4817efaa60c9f2d950119d1a
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Nov 4 14:45:27 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 18:59:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc3e350
mail-client/mutt: update url
dev.mutt.org does not exist anymore.
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
mail-client/mutt/mutt-1.11.4.ebuild | 2 +-
mail-client/mutt/mutt-1.12.1.ebuild | 2 +-
mail-client/mutt/mutt-1.12.2-r1.ebuild | 2 +-
mail-client/mutt/mutt-1.12.2-r2.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 084c4add8e0..84dcae7bb3c 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -277,6 +277,6 @@ pkg_postinst() {
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"
+ ewarn " https://www.mutt.org/doc/manual/#crypt-use-gpgme"
fi
}
diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
index cee2882cd8f..3f6633e30d9 100644
--- a/mail-client/mutt/mutt-1.11.4.ebuild
+++ b/mail-client/mutt/mutt-1.11.4.ebuild
@@ -283,6 +283,6 @@ pkg_postinst() {
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"
+ ewarn " https://www.mutt.org/doc/manual/#crypt-use-gpgme"
fi
}
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index 9f35aa2497e..95e66231cb2 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -284,6 +284,6 @@ pkg_postinst() {
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"
+ ewarn " https://www.mutt.org/doc/manual/#crypt-use-gpgme"
fi
}
diff --git a/mail-client/mutt/mutt-1.12.2-r1.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
index ddd2e3013ea..461d17b16b6 100644
--- a/mail-client/mutt/mutt-1.12.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild
@@ -284,6 +284,6 @@ pkg_postinst() {
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"
+ ewarn " https://www.mutt.org/doc/manual/#crypt-use-gpgme"
fi
}
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
index 94df0e4f961..1300423d9a3 100644
--- a/mail-client/mutt/mutt-1.12.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -267,6 +267,6 @@ pkg_postinst() {
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"
+ ewarn " https://www.mutt.org/doc/manual/#crypt-use-gpgme"
fi
}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-11-14 8:53 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-11-14 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 6c5c75fbd1ac48262ebece82a4142136c04dcfda
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 08:01:47 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 08:52:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5c75fb
mail-client/mutt-1.10.1: fix libidn automagic dep, bug #674682
Closes: https://bugs.gentoo.org/674682
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-1.10.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 84dcae7bb3c..2c5a5a9392f 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -153,7 +153,7 @@ src_configure() {
$(use !ssl && echo --without-gnutls --without-ssl)
$(use_with sasl)
- $(use_with idn)
+ $(use_with idn) --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)"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-12-01 9:34 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-12-01 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 83abebd3b7051b9808d8ee1dfec4543773b00bd7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 09:32:31 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 09:34:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83abebd3
mail-client/mutt-1.13.0: version bump
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.13.0.ebuild | 253 ++++++++++++++++++++++++++++++++++++
2 files changed, 255 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 0ff5222a6cd..d6d8772a2fd 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,7 +2,9 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
+DIST mutt-1.13.0.tar.gz 4889693 BLAKE2B 1c3f1e2107ea4f6147b9010ab4751afc09dbf16eec88c8c94b8edf84783abb8e75649eb3482d043c1c2fdd8c9428599ddcd844b72fa55881b5728ab09b564e07 SHA512 76dc0a0cce4293851fb4caa0018538f112bac0f02a1faa2a8ec62bbf078b130d2907709423b3eda5217d24886e58a1e7a184a094701c9bdb989e93b9dac123fa
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
+DIST mutt-gentoo-1.13.0-patches-r0.tar.xz 36020 BLAKE2B 56bda1576ef2ab8c0fa2f35ee0ddab88a391512c1530ad7ec77d921ee5686645cbde97ca3b131eb7370a89fe0517b1d4424aca3aea81dc708dcad51226eb1f29 SHA512 750e2165b4e4ae4f8caa0bf81797edbe10f0e10195978cbbf1a59263e788c5fa5e0ed78cdff19af1a574d9fdc0cc4c84c82faa712e755a482f8107390446a746
diff --git a/mail-client/mutt/mutt-1.13.0.ebuild b/mail-client/mutt/mutt-1.13.0.ebuild
new file mode 100644
index 00000000000..031717cb2e3
--- /dev/null
+++ b/mail-client/mutt/mutt-1.13.0.ebuild
@@ -0,0 +1,253 @@
+# 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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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[@]}" || 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
+
+ # 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 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 "The nntp and notmuch patches were dropped from this release."
+ ewarn "Due to too much maintenance cost, the nntp and notmuch patches"
+ ewarn "were dropped from this release. If you need support for any"
+ ewarn "of these features, please consider using mail-client/neomutt."
+ echo
+ fi
+ if use !pgp-classic && use !smime-classic && use !gpgme ; then
+ ewarn "Please note that crypto related USE-flags of Mutt have changed."
+ ewarn "To comply with PMS, the following USE-flags were renamed:"
+ ewarn "(see https://bugs.gentoo.org/695078)"
+ ewarn " pgp_classic -> pgp-classic"
+ ewarn " smime_classic -> smime-classic"
+ echo
+ 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"
+ # https is broken due to a certificate mismatch :(
+ ewarn " http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-12-15 9:26 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-12-15 9:26 UTC (permalink / raw
To: gentoo-commits
commit: a1dbf90dcf46b40d095213572a9723848b99b094
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 09:25:55 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 09:25:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1dbf90d
mail-client/mutt-1.13.1: version bump
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.13.0.ebuild => mutt-1.13.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d6d8772a2fd..e549394e67f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,9 +2,9 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
-DIST mutt-1.13.0.tar.gz 4889693 BLAKE2B 1c3f1e2107ea4f6147b9010ab4751afc09dbf16eec88c8c94b8edf84783abb8e75649eb3482d043c1c2fdd8c9428599ddcd844b72fa55881b5728ab09b564e07 SHA512 76dc0a0cce4293851fb4caa0018538f112bac0f02a1faa2a8ec62bbf078b130d2907709423b3eda5217d24886e58a1e7a184a094701c9bdb989e93b9dac123fa
+DIST mutt-1.13.1.tar.gz 4895458 BLAKE2B 4a69e27137c179571724fdd98781b4a282a8fda34964c13f1777a29e77389bca1a9ff1d3aed7fcc909f4153f0cf16cb8f3be3d1dd25c2cc3d34f215f3518096a SHA512 d65026caa0095d0ffc89bf169eec6bdbce539252653c81ed7c5aed1d00363d468ec052126ee702102f7225cd61dc4b9f8d7d677bd25a32b207adc30b49e9a0e8
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-DIST mutt-gentoo-1.13.0-patches-r0.tar.xz 36020 BLAKE2B 56bda1576ef2ab8c0fa2f35ee0ddab88a391512c1530ad7ec77d921ee5686645cbde97ca3b131eb7370a89fe0517b1d4424aca3aea81dc708dcad51226eb1f29 SHA512 750e2165b4e4ae4f8caa0bf81797edbe10f0e10195978cbbf1a59263e788c5fa5e0ed78cdff19af1a574d9fdc0cc4c84c82faa712e755a482f8107390446a746
+DIST mutt-gentoo-1.13.1-patches-r0.tar.xz 35888 BLAKE2B fc84e40794e0d1a66226c84423ddfa61deb5eea8bd87d8c6b611aebb049f8e100dda96e49dfd4f42e284ced8cf99e6aac38d72433cfad6c378e3fcf34ecedc57 SHA512 7f8045075df8e14ca8a163d9c2e0f7047dfb783e40086dc47b0c2c27a5e094f5e50f9df34d3eda935f9679339212c150579f747a85cdb4341e2f6eeaa2f1db7b
diff --git a/mail-client/mutt/mutt-1.13.0.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.13.0.ebuild
rename to mail-client/mutt/mutt-1.13.1.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2019-12-18 8:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2019-12-18 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 0d6d0475aa70761c30bb579e32cf092ecd489668
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 08:05:02 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 08:05:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6d0475
mail-client/mutt-1.13.1: bump patchset for IMAP deflate trial fix
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +-
mail-client/mutt/mutt-1.13.1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e549394e67f..96fa2504276 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -7,4 +7,4 @@ DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-DIST mutt-gentoo-1.13.1-patches-r0.tar.xz 35888 BLAKE2B fc84e40794e0d1a66226c84423ddfa61deb5eea8bd87d8c6b611aebb049f8e100dda96e49dfd4f42e284ced8cf99e6aac38d72433cfad6c378e3fcf34ecedc57 SHA512 7f8045075df8e14ca8a163d9c2e0f7047dfb783e40086dc47b0c2c27a5e094f5e50f9df34d3eda935f9679339212c150579f747a85cdb4341e2f6eeaa2f1db7b
+DIST mutt-gentoo-1.13.1-patches-r1.tar.xz 36044 BLAKE2B 7caf7dc1e905bc09b72e69bf33819674dfcaf04fcc4db93955d0702559c85bcc886d7a5fd79dc59c7298771ac918ad78fa187ea3f7fbdadcd4e0af474952fdfb SHA512 ae4a078840aacff2ce5c5df03c7d3ebbfb1014816e7289776c446df3a693a76587aae670f567af0e824e603aeaa52eaff978f90c87bede8878fcc29a1995e7e6
diff --git a/mail-client/mutt/mutt-1.13.1.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
index 4cd23e5423a..cede0e80d77 100644
--- a/mail-client/mutt/mutt-1.13.1.ebuild
+++ b/mail-client/mutt/mutt-1.13.1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-01-31 8:08 Michał Górny
0 siblings, 0 replies; 249+ messages in thread
From: Michał Górny @ 2020-01-31 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 751a6abcae3933f32aa8650964a4c9330192c2a9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 08:01:49 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 08:08:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751a6abc
mail-client/mutt: Fix AbsoluteSymlink
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
mail-client/mutt/mutt-1.10.1.ebuild | 4 ++--
mail-client/mutt/mutt-1.11.4.ebuild | 4 ++--
mail-client/mutt/mutt-1.12.1.ebuild | 4 ++--
mail-client/mutt/mutt-1.12.2-r1.ebuild | 4 ++--
mail-client/mutt/mutt-1.12.2-r2.ebuild | 4 ++--
mail-client/mutt/mutt-1.13.1.ebuild | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 44ce4713c44..b61d695b111 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -223,7 +223,7 @@ src_install() {
# 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
+ dosym ../mime.types /etc/${PN}/mime.types
# A man-page is always handy, so fake one
if use !doc; then
diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
index 9a75061ed7c..0b9a1ff5ceb 100644
--- a/mail-client/mutt/mutt-1.11.4.ebuild
+++ b/mail-client/mutt/mutt-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -225,7 +225,7 @@ src_install() {
# 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
+ dosym ../mime.types /etc/${PN}/mime.types
# A man-page is always handy, so fake one
if use !doc; then
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index c6dbb769306..9520c1c482d 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -226,7 +226,7 @@ src_install() {
# 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
+ dosym ../mime.types /etc/${PN}/mime.types
# A man-page is always handy, so fake one
if use !doc; then
diff --git a/mail-client/mutt/mutt-1.12.2-r1.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
index b246b32c07b..cfee64ff6e1 100644
--- a/mail-client/mutt/mutt-1.12.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -226,7 +226,7 @@ src_install() {
# 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
+ dosym ../mime.types /etc/${PN}/mime.types
# A man-page is always handy, so fake one
if use !doc; then
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
index 77e56912372..71fedef1a7f 100644
--- a/mail-client/mutt/mutt-1.12.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -220,7 +220,7 @@ src_install() {
# 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
+ dosym ../mime.types /etc/${PN}/mime.types
# A man-page is always handy, so fake one
if use !doc; then
diff --git a/mail-client/mutt/mutt-1.13.1.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
index cede0e80d77..c22bedfc03d 100644
--- a/mail-client/mutt/mutt-1.13.1.ebuild
+++ b/mail-client/mutt/mutt-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -208,7 +208,7 @@ src_install() {
# 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
+ 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 \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-02-16 13:33 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-02-16 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 326577b5b478ea24620959fa26269b6506214e00
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 13:33:05 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 13:33:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326577b5
mail-client/mutt-1.13.4: version bump
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.13.1.ebuild => mutt-1.13.4.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 96fa2504276..d510cb01f83 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,9 +2,9 @@ DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9
DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
-DIST mutt-1.13.1.tar.gz 4895458 BLAKE2B 4a69e27137c179571724fdd98781b4a282a8fda34964c13f1777a29e77389bca1a9ff1d3aed7fcc909f4153f0cf16cb8f3be3d1dd25c2cc3d34f215f3518096a SHA512 d65026caa0095d0ffc89bf169eec6bdbce539252653c81ed7c5aed1d00363d468ec052126ee702102f7225cd61dc4b9f8d7d677bd25a32b207adc30b49e9a0e8
+DIST mutt-1.13.4.tar.gz 4901222 BLAKE2B 70ab2dcd93d860a2a1bc31059230f034bc87780e423f6a7ccd3b464d67c59d0f547ad2ae2ddfa42f07dc3d5ec9dea2e7302f92eeb2f5b9f722798ea80bf2fe1d SHA512 59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-DIST mutt-gentoo-1.13.1-patches-r1.tar.xz 36044 BLAKE2B 7caf7dc1e905bc09b72e69bf33819674dfcaf04fcc4db93955d0702559c85bcc886d7a5fd79dc59c7298771ac918ad78fa187ea3f7fbdadcd4e0af474952fdfb SHA512 ae4a078840aacff2ce5c5df03c7d3ebbfb1014816e7289776c446df3a693a76587aae670f567af0e824e603aeaa52eaff978f90c87bede8878fcc29a1995e7e6
+DIST mutt-gentoo-1.13.4-patches-r0.tar.xz 36084 BLAKE2B 80f508d55199b036d7ba2a5b848dc99a4d60acea5edbc5b582472ee61c89f477fe613c043c6abf6fd4c9ef6c70acc0c656c2e93430b2fbce0aa39a8e0a0ef480 SHA512 775b22b667d67d1ddc9b2c15d208c52f00bc8e42cabc2985eb5f2983589476d5fc6eaab38230aeafd7e4dbcb6165eef33ea2d5721cc973d406ca4f736afd4c32
diff --git a/mail-client/mutt/mutt-1.13.1.ebuild b/mail-client/mutt/mutt-1.13.4.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-1.13.1.ebuild
rename to mail-client/mutt/mutt-1.13.4.ebuild
index c22bedfc03d..f67a122ec25 100644
--- a/mail-client/mutt/mutt-1.13.1.ebuild
+++ b/mail-client/mutt/mutt-1.13.4.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r1"
+PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-06 7:25 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-03-06 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 256fdce3926b98ba0ecd04cf2ec32dd29c02a7d1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 07:15:15 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 07:25:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256fdce3
mail-client/mutt: cleanup old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 -
mail-client/mutt/mutt-1.11.4.ebuild | 288 --------------------------------
mail-client/mutt/mutt-1.12.1.ebuild | 289 ---------------------------------
mail-client/mutt/mutt-1.12.2-r1.ebuild | 289 ---------------------------------
4 files changed, 870 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d510cb01f83..2a726abed65 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,10 +1,6 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
-DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb
-DIST mutt-1.12.1.tar.gz 4675166 BLAKE2B f1c073e05d60f41a8057d90074b7cbc2a882243b0c4b495b1b147356c83daad136d5574dd6a567c0180823e73d8fb79a38d316ab0b2c56731baed24fe9ad9890 SHA512 0101120ad2acab89552be210725bae1a903f0b2c48be7207750589d141236537823f27c39e8d700eee16eb6b978058d056180b3d51e45e0242546f176b971538
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
DIST mutt-1.13.4.tar.gz 4901222 BLAKE2B 70ab2dcd93d860a2a1bc31059230f034bc87780e423f6a7ccd3b464d67c59d0f547ad2ae2ddfa42f07dc3d5ec9dea2e7302f92eeb2f5b9f722798ea80bf2fe1d SHA512 59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
-DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
-DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
DIST mutt-gentoo-1.13.4-patches-r0.tar.xz 36084 BLAKE2B 80f508d55199b036d7ba2a5b848dc99a4d60acea5edbc5b582472ee61c89f477fe613c043c6abf6fd4c9ef6c70acc0c656c2e93430b2fbce0aa39a8e0a0ef480 SHA512 775b22b667d67d1ddc9b2c15d208c52f00bc8e42cabc2985eb5f2983589476d5fc6eaab38230aeafd7e4dbcb6165eef33ea2d5721cc973d406ca4f736afd4c32
diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
deleted file mode 100644
index 0b9a1ff5ceb..00000000000
--- a/mail-client/mutt/mutt-1.11.4.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2020 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 ~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[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- 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 ../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
- # 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://www.mutt.org/doc/manual/#crypt-use-gpgme"
- fi
-}
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
deleted file mode 100644
index 9520c1c482d..00000000000
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2020 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 ) )
- vanilla? ( !nntp !notmuch )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- 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 ../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
- # 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://www.mutt.org/doc/manual/#crypt-use-gpgme"
- fi
-}
diff --git a/mail-client/mutt/mutt-1.12.2-r1.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
deleted file mode 100644
index cfee64ff6e1..00000000000
--- a/mail-client/mutt/mutt-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r1"
-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 ) )
- vanilla? ( !nntp !notmuch )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- 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 ../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
- # 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://www.mutt.org/doc/manual/#crypt-use-gpgme"
- fi
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-06 7:25 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-03-06 7:25 UTC (permalink / raw
To: gentoo-commits
commit: be647df7eeea95cad901ebb25fc290d8c6071046
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 6 07:25:11 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 6 07:25:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be647df7
mail-client/mutt-1.13.4-r1: provide mandatory atachments settings
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../mutt/{mutt-1.13.4.ebuild => mutt-1.13.4-r1.ebuild} | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-1.13.4.ebuild b/mail-client/mutt/mutt-1.13.4-r1.ebuild
similarity index 95%
rename from mail-client/mutt/mutt-1.13.4.ebuild
rename to mail-client/mutt/mutt-1.13.4-r1.ebuild
index f67a122ec25..bf80a3ff6d2 100644
--- a/mail-client/mutt/mutt-1.13.4.ebuild
+++ b/mail-client/mutt/mutt-1.13.4-r1.ebuild
@@ -198,14 +198,22 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
+ insinto /etc/${PN}
if use mbox; then
- insinto /etc/mutt
newins "${FILESDIR}"/Muttrc.mbox Muttrc
else
- insinto /etc/mutt
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
+
# 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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-30 7:17 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-03-30 7:17 UTC (permalink / raw
To: gentoo-commits
commit: 4ed08d8150e512a92931542844b963a0739cfd28
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 07:17:20 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 07:17:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed08d81
mail-client/mutt-1.13.5: version bump
- new release addresses security bug
- invalid USE-flags pgp_classic and smime_classic are removed
Bug: https://bugs.gentoo.org/715352
Bug: https://bugs.gentoo.org/695078
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.13.5.ebuild | 268 ++++++++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2a726abed65..3c1a869e3d5 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
DIST mutt-1.13.4.tar.gz 4901222 BLAKE2B 70ab2dcd93d860a2a1bc31059230f034bc87780e423f6a7ccd3b464d67c59d0f547ad2ae2ddfa42f07dc3d5ec9dea2e7302f92eeb2f5b9f722798ea80bf2fe1d SHA512 59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3
+DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
DIST mutt-gentoo-1.13.4-patches-r0.tar.xz 36084 BLAKE2B 80f508d55199b036d7ba2a5b848dc99a4d60acea5edbc5b582472ee61c89f477fe613c043c6abf6fd4c9ef6c70acc0c656c2e93430b2fbce0aa39a8e0a0ef480 SHA512 775b22b667d67d1ddc9b2c15d208c52f00bc8e42cabc2985eb5f2983589476d5fc6eaab38230aeafd7e4dbcb6165eef33ea2d5721cc973d406ca4f736afd4c32
+DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
new file mode 100644
index 00000000000..ad8d65ddb60
--- /dev/null
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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 ; 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
+
+ # 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 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 "The nntp and notmuch patches were dropped from this release."
+ echo
+ elog "Due to too much maintenance cost, the nntp and notmuch patches"
+ elog "were dropped from this release. If you need support for any"
+ elog "of these features, please consider using mail-client/neomutt."
+ echo
+ fi
+ # try to warn user in case none of the crypto flags appear enabled
+ if use !pgp-classic && use !smime-classic && use !gpgme ; then
+ ewarn "Please note that crypto related USE-flags of Mutt have changed."
+ ewarn "To comply with PMS, the following USE-flags were renamed:"
+ ewarn "(see https://bugs.gentoo.org/695078)"
+ ewarn " pgp_classic -> pgp-classic"
+ ewarn " smime_classic -> smime-classic"
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-30 15:13 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-03-30 15:13 UTC (permalink / raw
To: gentoo-commits
commit: e85566bc144fb7a649df1b9b18d5e237d90d0cf5
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 15:13:00 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 15:13:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85566bc
mail-client/mutt: amd64 stable wrt bug #715352
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.13.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
index ad8d65ddb60..ac5d286d810 100644
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-30 20:50 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2020-03-30 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 5103b6b743aac59bdfa4a52ac3e92c1f83ce4d46
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Mar 30 19:13:07 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 20:50:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5103b6b7
mail-client/mutt: stable 1.13.5 for hppa/sparc, bug #715352
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-1.13.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
index ac5d286d810..c83cd314008 100644
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-31 7:18 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-03-31 7:18 UTC (permalink / raw
To: gentoo-commits
commit: 203941b92b5692b975536aafe6deb288122ae08c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 07:18:56 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 07:18:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203941b9
mail-client/mutt: arm stable wrt bug #715352
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.13.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
index c83cd314008..b97cb66d453 100644
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-31 7:19 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-03-31 7:19 UTC (permalink / raw
To: gentoo-commits
commit: 82627d215eec26f25d24810533ddcdc654f66d8b
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 07:19:45 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 07:19:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82627d21
mail-client/mutt: ppc stable wrt bug #715352
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.13.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
index b97cb66d453..f53265babb0 100644
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-31 7:20 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-03-31 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 20feb60beed53a02fb682b2cfba234e3c15951b4
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 07:20:26 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 07:20:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20feb60b
mail-client/mutt: ppc64 stable wrt bug #715352
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.13.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
index f53265babb0..7219b396077 100644
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-31 7:22 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-03-31 7:22 UTC (permalink / raw
To: gentoo-commits
commit: 3cda4e808b8c76aea87e9eb25dd6c4a38b688d2d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 07:22:38 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 07:22:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cda4e80
mail-client/mutt: x86 stable wrt bug #715352
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.13.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
index 7219b396077..82de8485b7a 100644
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ b/mail-client/mutt/mutt-1.13.5.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
kerberos? ( || ( imap pop smtp ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-03-31 17:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-03-31 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 5ed5ce158eb5bbdefe78f0332ab87823da905f11
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 17:04:59 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 17:04:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed5ce15
mail-client/mutt: security cleanup
Bug: https://bugs.gentoo.org/715352
Closes: https://bugs.gentoo.org/695078
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 6 -
mail-client/mutt/metadata.xml | 7 -
mail-client/mutt/mutt-1.10.1.ebuild | 282 ---------------------------------
mail-client/mutt/mutt-1.12.2-r2.ebuild | 272 -------------------------------
mail-client/mutt/mutt-1.13.4-r1.ebuild | 261 ------------------------------
5 files changed, 828 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 3c1a869e3d5..af9a77b11b2 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,2 @@
-DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
-DIST mutt-1.12.2.tar.gz 4675774 BLAKE2B 0b0a4695f31db97437e7d6e52ca8e131376bd0ae168195a4a73c3d2230f43460000c5b623e39b89c5cc7bf5253e7ffad8f007b844a864fcde94baef1aa7369f9 SHA512 a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd
-DIST mutt-1.13.4.tar.gz 4901222 BLAKE2B 70ab2dcd93d860a2a1bc31059230f034bc87780e423f6a7ccd3b464d67c59d0f547ad2ae2ddfa42f07dc3d5ec9dea2e7302f92eeb2f5b9f722798ea80bf2fe1d SHA512 59ae13d7cef052818f38f6d52e2cb42251f393ecf622eae113bfa29218b541195471de822efbdb072c6f74a4dc385bb94fe27c37b44c62eac7e2a0a4e0c6adc3
DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
-DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-DIST mutt-gentoo-1.13.4-patches-r0.tar.xz 36084 BLAKE2B 80f508d55199b036d7ba2a5b848dc99a4d60acea5edbc5b582472ee61c89f477fe613c043c6abf6fd4c9ef6c70acc0c656c2e93430b2fbce0aa39a8e0a0ef480 SHA512 775b22b667d67d1ddc9b2c15d208c52f00bc8e42cabc2985eb5f2983589476d5fc6eaab38230aeafd7e4dbcb6165eef33ea2d5721cc973d406ca4f736afd4c32
DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 3c947815701..6d9a60c2d6f 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -13,21 +13,14 @@
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="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="pgp_classic">Build classic_pgp backend to support PGP/MIME
- and traditional/inline PGP</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>
<flag name="smime-classic">Build classic_smime backend to support
S/MIME</flag>
</use>
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
deleted file mode 100644
index b61d695b111..00000000000
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2020 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 ~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
-
- 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) --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-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[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- 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 ../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
- # 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
- 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://www.mutt.org/doc/manual/#crypt-use-gpgme"
- fi
-}
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
deleted file mode 100644
index 71fedef1a7f..00000000000
--- a/mail-client/mutt/mutt-1.12.2-r2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r1"
-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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pgp-classic pop qdbm +sasl selinux slang smime_classic 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_classic? ( ssl !gnutls )
- smtp? ( ssl sasl )
- sasl? ( || ( imap pop smtp nntp ) )
- kerberos? ( || ( imap pop smtp nntp ) )
- vanilla? ( !nntp !notmuch )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
- 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_classic? ( || ( dev-libs/libressl >=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
- 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 pgp_classic && use_enable pgp_classic pgp)
- $(use pgp-classic && use_enable pgp-classic pgp)
- $(use !pgp_classic && use !pgp-classic && echo "--disable-pgp")
-
- $(use smime_classic && use_enable smime_classic smime)
- $(use smime-classic && use_enable smime-classic smime)
- $(use !smime_classic && use !smime-classic && echo "--disable-smime")
-
- $(use_enable 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[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- 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 ../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
- # 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
- fi
- if use pgp_classic || use smime_classic ; then
- ewarn "Please note that crypto related USE-flags of mutt have changed."
- ewarn "To compile to PMS, the following USE-flags are renamed:"
- ewarn "(see https://bugs.gentoo.org/695078)"
- ewarn " pgp_classic -> pgp-classic"
- ewarn " smime_classic -> 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"
- 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://www.mutt.org/doc/manual/#crypt-use-gpgme"
- fi
-}
diff --git a/mail-client/mutt/mutt-1.13.4-r1.ebuild b/mail-client/mutt/mutt-1.13.4-r1.ebuild
deleted file mode 100644
index bf80a3ff6d2..00000000000
--- a/mail-client/mutt/mutt-1.13.4-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- 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 ) )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
- gpgme? ( >=app-crypt/gpgme-0.9.0:= )
- 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/libressl >=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
- 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
- $(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_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}"
- "--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
-
- # 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 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 "The nntp and notmuch patches were dropped from this release."
- ewarn "Due to too much maintenance cost, the nntp and notmuch patches"
- ewarn "were dropped from this release. If you need support for any"
- ewarn "of these features, please consider using mail-client/neomutt."
- echo
- fi
- if use !pgp-classic && use !smime-classic && use !gpgme ; then
- ewarn "Please note that crypto related USE-flags of Mutt have changed."
- ewarn "To comply with PMS, the following USE-flags were renamed:"
- ewarn "(see https://bugs.gentoo.org/695078)"
- ewarn " pgp_classic -> pgp-classic"
- ewarn " smime_classic -> smime-classic"
- echo
- 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"
- # https is broken due to a certificate mismatch :(
- ewarn " http://www.mutt.org/doc/manual/#crypt-use-gpgme"
- fi
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-05-04 7:09 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-05-04 7:09 UTC (permalink / raw
To: gentoo-commits
commit: a3e4d08ec543b9e269dbf297ed8cbd600c32711d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 4 07:07:34 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 4 07:09:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e4d08e
mail-client/mutt-1.14.0: version bump
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.14.0.ebuild | 257 ++++++++++++++++++++++++++++++++++++
2 files changed, 259 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index af9a77b11b2..38f1f5edc7d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
+DIST mutt-1.14.0.tar.gz 5220515 BLAKE2B 4a9b70f0d32df1a33947898b71044a97b9cbca04ba0c01f06cae967cb9dff6fa06dd005c7f0e0642654a4cef04686eb38af7c032aa361f0e3f2f57faf66d93d4 SHA512 66eddad7a9ce0c067795b8f0285159a6aa7fbf9304ef287888f1c86a942d565e1f71294549e22960a4db8bcc06b1e9f6690c3e04dedf8b37d304b4aa6a250225
DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
+DIST mutt-gentoo-1.14.0-patches-r0.tar.xz 31124 BLAKE2B e5703fb22d627cac2fd7ef9565c10a46ccd3153611335aa3051b1d38feb68b52fb0bd0a1360c02fa0723bedbdaa2b4000020546f3f5bf039b5e9578c6481cf6f SHA512 1c89d6843392ad9db869dce9c90a04cb712bf3c783797f231749fddee6047e5ec79513abca644e76e3f28c4af2e94f055ab72a794f4ba6a971d2f668c6b6a1ff
diff --git a/mail-client/mutt/mutt-1.14.0.ebuild b/mail-client/mutt/mutt-1.14.0.ebuild
new file mode 100644
index 00000000000..45ba49cadf8
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.0.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2020 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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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 ; 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
+
+ # 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 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
+ elog "The multiple fcc patch was dropped in favour of an implementation"
+ elog "from upstream. If you use the feature, review the new"
+ elog " \$fcc_delimiter"
+ elog "variable."
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-05-14 18:11 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-05-14 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 12c5abc5f4353e7b94e35ac3f83068ebb67b8f5a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 18:10:24 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 14 18:10:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c5abc5
mail-client/mutt-1.14.0-r1: revbump to enable USE=autocrypt support
Closes: https://bugs.gentoo.org/722874
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/metadata.xml | 1 +
.../{mutt-1.14.0.ebuild => mutt-1.14.0-r1.ebuild} | 19 ++++++++++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index 6d9a60c2d6f..f418ce80a68 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -5,6 +5,7 @@
<email>grobian@gentoo.org</email>
</maintainer>
<use>
+ <flag name="autocrypt">Enable autocrypt.org support</flag>
<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
diff --git a/mail-client/mutt/mutt-1.14.0.ebuild b/mail-client/mutt/mutt-1.14.0-r1.ebuild
similarity index 92%
rename from mail-client/mutt/mutt-1.14.0.ebuild
rename to mail-client/mutt/mutt-1.14.0-r1.ebuild
index 45ba49cadf8..655ecdfe2af 100644
--- a/mail-client/mutt/mutt-1.14.0.ebuild
+++ b/mail-client/mutt/mutt-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ 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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
# hcache: allow multiple, bug #607360
REQUIRED_USE="
hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
@@ -23,7 +23,8 @@ REQUIRED_USE="
smime-classic? ( ssl !gnutls )
smtp? ( ssl sasl )
sasl? ( || ( imap pop smtp ) )
- kerberos? ( || ( imap pop smtp ) )"
+ kerberos? ( || ( imap pop smtp ) )
+ autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -52,6 +53,7 @@ CDEPEND="
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= )
"
@@ -118,6 +120,7 @@ src_prepare() {
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)
@@ -215,7 +218,7 @@ src_install() {
} >> "${ED}"/etc/${PN}/Muttrc
# add setting to actually enable gpgme usage
- if use gpgme ; then
+ if use gpgme || use autocrypt ; then
{
echo
echo "# this setting enables the gpgme backend (via USE=gpgme)"
@@ -225,6 +228,16 @@ src_install() {
} >> "${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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-05-26 7:11 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-05-26 7:11 UTC (permalink / raw
To: gentoo-commits
commit: 4b692e701e020c6fbffe202667092728b662926f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 07:10:44 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 26 07:10:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b692e70
mail-client/mutt-1.14.2: version bump
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.14.2.ebuild | 270 ++++++++++++++++++++++++++++++++++++
2 files changed, 272 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 38f1f5edc7d..498b63a89da 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
DIST mutt-1.14.0.tar.gz 5220515 BLAKE2B 4a9b70f0d32df1a33947898b71044a97b9cbca04ba0c01f06cae967cb9dff6fa06dd005c7f0e0642654a4cef04686eb38af7c032aa361f0e3f2f57faf66d93d4 SHA512 66eddad7a9ce0c067795b8f0285159a6aa7fbf9304ef287888f1c86a942d565e1f71294549e22960a4db8bcc06b1e9f6690c3e04dedf8b37d304b4aa6a250225
+DIST mutt-1.14.2.tar.gz 5222938 BLAKE2B e59dd4e1e61380a3c49fce8d722e7a263e81713208660e28629f428bc13724ccc80cffb3345ec1b8dd0a8aefa32ccdea94b8098b826268ce0fe64f6a11bdfec5 SHA512 b18b0bc52341d31a60558ca9b11545f5352e89bf7c215b10061efcd382af287416299f7efa017e3a03937a11fd630330ff8389dbe80fae2e6437297687653cb8
DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
DIST mutt-gentoo-1.14.0-patches-r0.tar.xz 31124 BLAKE2B e5703fb22d627cac2fd7ef9565c10a46ccd3153611335aa3051b1d38feb68b52fb0bd0a1360c02fa0723bedbdaa2b4000020546f3f5bf039b5e9578c6481cf6f SHA512 1c89d6843392ad9db869dce9c90a04cb712bf3c783797f231749fddee6047e5ec79513abca644e76e3f28c4af2e94f055ab72a794f4ba6a971d2f668c6b6a1ff
+DIST mutt-gentoo-1.14.2-patches-r0.tar.xz 31076 BLAKE2B 31bb4efd03f45b4b79ed325471166e91f0e419318f3cf1e5426a627e2557bf19fbe03ae2c19cc97719c574b6a8df19b96955429651bffb41d5220888553b86a9 SHA512 5a0ddf0242caed5bed19700904b0fd91883542b9b12f0b16c1b4f7f39944d0737429991cca7cbf4f9932deada8b7fd71caff284775ddfcf3ec283554d3e727a9
diff --git a/mail-client/mutt/mutt-1.14.2.ebuild b/mail-client/mutt/mutt-1.14.2.ebuild
new file mode 100644
index 00000000000..655ecdfe2af
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.2.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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 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
+ elog "The multiple fcc patch was dropped in favour of an implementation"
+ elog "from upstream. If you use the feature, review the new"
+ elog " \$fcc_delimiter"
+ elog "variable."
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-15 19:49 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-06-15 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 6cdea241a6c518a14f1fc0f20dc2562bf3621ddf
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 19:48:18 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 19:49:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdea241
mail-client/mutt-1.14.3: version bump fixing security issues
Bug: https://bugs.gentoo.org/728294
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-1.14.0-r1.ebuild => mutt-1.14.3.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 498b63a89da..23af2d5b41e 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-DIST mutt-1.14.0.tar.gz 5220515 BLAKE2B 4a9b70f0d32df1a33947898b71044a97b9cbca04ba0c01f06cae967cb9dff6fa06dd005c7f0e0642654a4cef04686eb38af7c032aa361f0e3f2f57faf66d93d4 SHA512 66eddad7a9ce0c067795b8f0285159a6aa7fbf9304ef287888f1c86a942d565e1f71294549e22960a4db8bcc06b1e9f6690c3e04dedf8b37d304b4aa6a250225
DIST mutt-1.14.2.tar.gz 5222938 BLAKE2B e59dd4e1e61380a3c49fce8d722e7a263e81713208660e28629f428bc13724ccc80cffb3345ec1b8dd0a8aefa32ccdea94b8098b826268ce0fe64f6a11bdfec5 SHA512 b18b0bc52341d31a60558ca9b11545f5352e89bf7c215b10061efcd382af287416299f7efa017e3a03937a11fd630330ff8389dbe80fae2e6437297687653cb8
+DIST mutt-1.14.3.tar.gz 5003987 BLAKE2B 43e9be05e3da6f3c257bc405fdf45b87114efdeece169d2919390b5cf35a935d1c2798b0ab7eb213eb25eed3008e452fc4c9f02ca8fdb209dce8d9655fe7fb84 SHA512 d7ac53cd383e7491666aeb0b33703dee47cfb9a8671484b713f3b5051227ca2fa618320df0267b7d4eb43a22f9fc9d20d457ddb3f98f907ce49fe7f2915a865e
DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
-DIST mutt-gentoo-1.14.0-patches-r0.tar.xz 31124 BLAKE2B e5703fb22d627cac2fd7ef9565c10a46ccd3153611335aa3051b1d38feb68b52fb0bd0a1360c02fa0723bedbdaa2b4000020546f3f5bf039b5e9578c6481cf6f SHA512 1c89d6843392ad9db869dce9c90a04cb712bf3c783797f231749fddee6047e5ec79513abca644e76e3f28c4af2e94f055ab72a794f4ba6a971d2f668c6b6a1ff
DIST mutt-gentoo-1.14.2-patches-r0.tar.xz 31076 BLAKE2B 31bb4efd03f45b4b79ed325471166e91f0e419318f3cf1e5426a627e2557bf19fbe03ae2c19cc97719c574b6a8df19b96955429651bffb41d5220888553b86a9 SHA512 5a0ddf0242caed5bed19700904b0fd91883542b9b12f0b16c1b4f7f39944d0737429991cca7cbf4f9932deada8b7fd71caff284775ddfcf3ec283554d3e727a9
+DIST mutt-gentoo-1.14.3-patches-r0.tar.xz 31148 BLAKE2B 49f5f7b446d635de31e5280bad09422bcf27543b58e2eade6ddec35524e9c49083fe59224e6103d6992f53571d77c606c6280e58d05606900ed01ccbd4c4d697 SHA512 444f6456b3c1eb423cd990c3f5a7f4f6ce7f0706f461ca507846ce6ee855e32331720bc7c0fa2cb834d5433d9e7a0d7d2d90c5b8c0ac917dbd3c63a622ae6ce5
diff --git a/mail-client/mutt/mutt-1.14.0-r1.ebuild b/mail-client/mutt/mutt-1.14.3.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-1.14.0-r1.ebuild
rename to mail-client/mutt/mutt-1.14.3.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-16 16:41 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2020-06-16 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 44bd390f6b82aa1fde7f37b10b7d34647315fdab
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Jun 16 15:00:24 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 16:41:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bd390f
mail-client/mutt: stable 1.14.3 for sparc, bug #728294
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-1.14.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.3.ebuild b/mail-client/mutt/mutt-1.14.3.ebuild
index 655ecdfe2af..01768f7d1c3 100644
--- a/mail-client/mutt/mutt-1.14.3.ebuild
+++ b/mail-client/mutt/mutt-1.14.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-17 20:36 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2020-06-17 20:36 UTC (permalink / raw
To: gentoo-commits
commit: d33da16bcd3d47d6d2b40af92b588e98cc3b47d4
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Jun 17 19:20:33 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 20:36:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33da16b
mail-client/mutt: stable 1.14.3 for hppa, bug #728294
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-1.14.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.3.ebuild b/mail-client/mutt/mutt-1.14.3.ebuild
index 01768f7d1c3..1080859254b 100644
--- a/mail-client/mutt/mutt-1.14.3.ebuild
+++ b/mail-client/mutt/mutt-1.14.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-19 7:01 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-06-19 7:01 UTC (permalink / raw
To: gentoo-commits
commit: 853490aded8a597f03bdd24b6f56cfffbfeecb97
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 07:00:59 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 07:00:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=853490ad
mail-client/mutt-1.14.4: another security bump
Bug: https://bugs.gentoo.org/728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.14.4.ebuild | 270 ++++++++++++++++++++++++++++++++++++
2 files changed, 272 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 23af2d5b41e..59e1934cdb4 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
DIST mutt-1.14.2.tar.gz 5222938 BLAKE2B e59dd4e1e61380a3c49fce8d722e7a263e81713208660e28629f428bc13724ccc80cffb3345ec1b8dd0a8aefa32ccdea94b8098b826268ce0fe64f6a11bdfec5 SHA512 b18b0bc52341d31a60558ca9b11545f5352e89bf7c215b10061efcd382af287416299f7efa017e3a03937a11fd630330ff8389dbe80fae2e6437297687653cb8
DIST mutt-1.14.3.tar.gz 5003987 BLAKE2B 43e9be05e3da6f3c257bc405fdf45b87114efdeece169d2919390b5cf35a935d1c2798b0ab7eb213eb25eed3008e452fc4c9f02ca8fdb209dce8d9655fe7fb84 SHA512 d7ac53cd383e7491666aeb0b33703dee47cfb9a8671484b713f3b5051227ca2fa618320df0267b7d4eb43a22f9fc9d20d457ddb3f98f907ce49fe7f2915a865e
+DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
DIST mutt-gentoo-1.14.2-patches-r0.tar.xz 31076 BLAKE2B 31bb4efd03f45b4b79ed325471166e91f0e419318f3cf1e5426a627e2557bf19fbe03ae2c19cc97719c574b6a8df19b96955429651bffb41d5220888553b86a9 SHA512 5a0ddf0242caed5bed19700904b0fd91883542b9b12f0b16c1b4f7f39944d0737429991cca7cbf4f9932deada8b7fd71caff284775ddfcf3ec283554d3e727a9
DIST mutt-gentoo-1.14.3-patches-r0.tar.xz 31148 BLAKE2B 49f5f7b446d635de31e5280bad09422bcf27543b58e2eade6ddec35524e9c49083fe59224e6103d6992f53571d77c606c6280e58d05606900ed01ccbd4c4d697 SHA512 444f6456b3c1eb423cd990c3f5a7f4f6ce7f0706f461ca507846ce6ee855e32331720bc7c0fa2cb834d5433d9e7a0d7d2d90c5b8c0ac917dbd3c63a622ae6ce5
+DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
diff --git a/mail-client/mutt/mutt-1.14.4.ebuild b/mail-client/mutt/mutt-1.14.4.ebuild
new file mode 100644
index 00000000000..655ecdfe2af
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.4.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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 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
+ elog "The multiple fcc patch was dropped in favour of an implementation"
+ elog "from upstream. If you use the feature, review the new"
+ elog " \$fcc_delimiter"
+ elog "variable."
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-20 13:48 Thomas Deutschmann
0 siblings, 0 replies; 249+ messages in thread
From: Thomas Deutschmann @ 2020-06-20 13:48 UTC (permalink / raw
To: gentoo-commits
commit: a0e5e08d3b8c56341240c1f1d95e9caec92ffb94
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 13:43:55 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 13:48:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e5e08d
mail-client/mutt: x86 stable (bug #728708)
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4.ebuild b/mail-client/mutt/mutt-1.14.4.ebuild
index 655ecdfe2af..6fa97b429ff 100644
--- a/mail-client/mutt/mutt-1.14.4.ebuild
+++ b/mail-client/mutt/mutt-1.14.4.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-20 18:59 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2020-06-20 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 1c518753f57c2bb5c2dd3f89172bb237cd12c470
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Jun 19 19:11:07 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 18:59:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c518753
mail-client/mutt: stable 1.14.4 for sparc, bug #728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4.ebuild b/mail-client/mutt/mutt-1.14.4.ebuild
index 6fa97b429ff..3bcd4d68ae4 100644
--- a/mail-client/mutt/mutt-1.14.4.ebuild
+++ b/mail-client/mutt/mutt-1.14.4.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-21 7:47 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-06-21 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 0bae31fa704aca6b1022859fe4deb7896ac021ee
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 07:46:52 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 07:46:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bae31fa
mail-client/mutt-1.14.4-r1: mark sparc and x86 stable, bug 728708 comment 8
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4-r1.ebuild | 2 +-
mail-client/mutt/mutt-1.14.4.ebuild | 270 ---------------------------------
2 files changed, 1 insertion(+), 271 deletions(-)
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 7703c01f823..2a138c89204 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~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="
diff --git a/mail-client/mutt/mutt-1.14.4.ebuild b/mail-client/mutt/mutt-1.14.4.ebuild
deleted file mode 100644
index 3bcd4d68ae4..00000000000
--- a/mail-client/mutt/mutt-1.14.4.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~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 )
- 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/libressl >=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
- 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
- $(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_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}"
- "--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 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
- elog "The multiple fcc patch was dropped in favour of an implementation"
- elog "from upstream. If you use the feature, review the new"
- elog " \$fcc_delimiter"
- elog "variable."
- fi
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-22 7:00 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-06-22 7:00 UTC (permalink / raw
To: gentoo-commits
commit: b4da5b93a1e40b65ce46e34a295e2ffa4af85392
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 07:00:04 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 07:00:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4da5b93
mail-client/mutt: arm stable wrt bug #728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 2a138c89204..93d395ed651 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-22 7:00 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-06-22 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 08a465b7d6b23569129a725709498203ed171720
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 07:00:44 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 07:00:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a465b7
mail-client/mutt: ppc stable wrt bug #728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 93d395ed651..083f46523df 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-22 7:01 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-06-22 7:01 UTC (permalink / raw
To: gentoo-commits
commit: 195ac42d26055b31ff379f42648cb26c2bf6191d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 07:01:24 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 07:01:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195ac42d
mail-client/mutt: ppc64 stable wrt bug #728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 083f46523df..71ee91f00c6 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-22 18:23 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2020-06-22 18:23 UTC (permalink / raw
To: gentoo-commits
commit: d6f8303098724ca340cad0dc6d20c6f255a05c16
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Jun 22 15:17:13 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 18:23:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f83030
mail-client/mutt: stable 1.14.4-r1 for hppa, bug #728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 71ee91f00c6..65056ee741d 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-25 7:00 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-06-25 7:00 UTC (permalink / raw
To: gentoo-commits
commit: b80bc8c2b3b4100bae7c1c99d09edb89b91e23e9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 06:59:36 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 06:59:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80bc8c2
mail-client/mutt: amd64 stable wrt bug #728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-1.14.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 65056ee741d..5ca782116a8 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-25 9:08 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-06-25 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 6cbaf7905f650a704ee884cb247d0d43b06b540a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 09:08:13 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 09:08:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbaf790
mail-client/mutt: cleanup vulnerable versions
Bug: https://bugs.gentoo.org/728708
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 -
mail-client/mutt/mutt-1.13.5.ebuild | 268 -----------------------------------
mail-client/mutt/mutt-1.14.3.ebuild | 270 ------------------------------------
3 files changed, 542 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 53bf8d6a901..6a30ee0e41a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,2 @@
-DIST mutt-1.13.5.tar.gz 4902500 BLAKE2B 24c7f40ca177a64118f30d3ea1af95ebbf88c4e9b53a12bab058544350606b85d47ed659eab5f59e5bf17964843243ce175b6e0f0571baca93367ed1bc866a94 SHA512 f2ea863626e5dad4854c98a1797faa97c9f14fb5161c590e88ee02afbdde7f48493bd2cce6109f9839501cf38aa238dc804f4c98f17ac97c68b48cb0bc0e5b4a
-DIST mutt-1.14.3.tar.gz 5003987 BLAKE2B 43e9be05e3da6f3c257bc405fdf45b87114efdeece169d2919390b5cf35a935d1c2798b0ab7eb213eb25eed3008e452fc4c9f02ca8fdb209dce8d9655fe7fb84 SHA512 d7ac53cd383e7491666aeb0b33703dee47cfb9a8671484b713f3b5051227ca2fa618320df0267b7d4eb43a22f9fc9d20d457ddb3f98f907ce49fe7f2915a865e
DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
-DIST mutt-gentoo-1.13.5-patches-r0.tar.xz 35932 BLAKE2B 7f4488e6478ba2a2593a58d9905fd8cb857d95a7c05dd90d7d08843bafc060c0560fc5061a85a0a91baf063f055139fa09e5a54ea353e0118418f73baa333928 SHA512 1ddad0550a9bc772247d5ca468efd044c9eeccb497cbe391b19382d598fd0ec8dbdb3d34d4297cc5cd3a8ff43c881155a5874db24e89c0f2a4702b6e0ba4f0d9
-DIST mutt-gentoo-1.14.3-patches-r0.tar.xz 31148 BLAKE2B 49f5f7b446d635de31e5280bad09422bcf27543b58e2eade6ddec35524e9c49083fe59224e6103d6992f53571d77c606c6280e58d05606900ed01ccbd4c4d697 SHA512 444f6456b3c1eb423cd990c3f5a7f4f6ce7f0706f461ca507846ce6ee855e32331720bc7c0fa2cb834d5433d9e7a0d7d2d90c5b8c0ac917dbd3c63a622ae6ce5
DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
diff --git a/mail-client/mutt/mutt-1.13.5.ebuild b/mail-client/mutt/mutt-1.13.5.ebuild
deleted file mode 100644
index 82de8485b7a..00000000000
--- a/mail-client/mutt/mutt-1.13.5.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2020 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 debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- 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 ) )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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 )
- gpgme? ( >=app-crypt/gpgme-0.9.0:= )
- 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/libressl >=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
- 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
- $(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_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}"
- "--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 ; 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
-
- # 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 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 "The nntp and notmuch patches were dropped from this release."
- echo
- elog "Due to too much maintenance cost, the nntp and notmuch patches"
- elog "were dropped from this release. If you need support for any"
- elog "of these features, please consider using mail-client/neomutt."
- echo
- fi
- # try to warn user in case none of the crypto flags appear enabled
- if use !pgp-classic && use !smime-classic && use !gpgme ; then
- ewarn "Please note that crypto related USE-flags of Mutt have changed."
- ewarn "To comply with PMS, the following USE-flags were renamed:"
- ewarn "(see https://bugs.gentoo.org/695078)"
- ewarn " pgp_classic -> pgp-classic"
- ewarn " smime_classic -> smime-classic"
- echo
- fi
-}
diff --git a/mail-client/mutt/mutt-1.14.3.ebuild b/mail-client/mutt/mutt-1.14.3.ebuild
deleted file mode 100644
index 1080859254b..00000000000
--- a/mail-client/mutt/mutt-1.14.3.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- 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 hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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 )
- 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/libressl >=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
- 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
- $(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_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}"
- "--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 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
- elog "The multiple fcc patch was dropped in favour of an implementation"
- elog "from upstream. If you use the feature, review the new"
- elog " \$fcc_delimiter"
- elog "variable."
- fi
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-06-25 9:42 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-06-25 9:42 UTC (permalink / raw
To: gentoo-commits
commit: 4ede6f5f742046bc9bdb151c072f58c0ac404c3c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 09:41:51 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 09:42:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ede6f5f
mail-client/mutt-1.14.5: version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.14.5.ebuild | 265 ++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6a30ee0e41a..f0d5f1686c0 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
+DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
+DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
diff --git a/mail-client/mutt/mutt-1.14.5.ebuild b/mail-client/mutt/mutt-1.14.5.ebuild
new file mode 100644
index 00000000000..eddd531443c
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.5.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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 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
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-07-10 10:54 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2020-07-10 10:54 UTC (permalink / raw
To: gentoo-commits
commit: ef5fe0f518c27c9806a0551421fb24e99061f175
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 10 10:51:56 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 10 10:51:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef5fe0f5
mail-client/mutt: arm64 keyworded (bug #730916)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-1.14.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-1.14.5.ebuild b/mail-client/mutt/mutt-1.14.5.ebuild
index eddd531443c..773c3c90952 100644
--- a/mail-client/mutt/mutt-1.14.5.ebuild
+++ b/mail-client/mutt/mutt-1.14.5.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-09-06 7:50 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-09-06 7:50 UTC (permalink / raw
To: gentoo-commits
commit: cfc29b9c39314c562e2e6b9f69a2cda2590731d4
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 07:50:27 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 07:50:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc29b9c
mail-client/mutt-1.14.7: version bump, bug #739750
Closes: https://bugs.gentoo.org/739750
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-1.14.7.ebuild | 265 ++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f0d5f1686c0..c35860c6471 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
+DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1 SHA512 dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
+DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82 SHA512 ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
diff --git a/mail-client/mutt/mutt-1.14.7.ebuild b/mail-client/mutt/mutt-1.14.7.ebuild
new file mode 100644
index 00000000000..773c3c90952
--- /dev/null
+++ b/mail-client/mutt/mutt-1.14.7.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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 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
+ fi
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-09 9:53 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-11-09 9:53 UTC (permalink / raw
To: gentoo-commits
commit: e136e62a128971469e60aead3fdbf6508398d4e8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 09:51:35 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 09:53:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e136e62a
mail-client/mutt-2.0.0: version bump
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.0.0.ebuild | 268 +++++++++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c35860c6471..0d5727c40d5 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1 SHA512 dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
+DIST mutt-2.0.0.tar.gz 5287742 BLAKE2B d45cae45e560548a3f278972e7bff820c860b194f06286a4e2c456141e7d421b1812f423e31594d0c4b0c82c8c9f597498888a8e127d41b8c172a5319a23cc8e SHA512 2f48bf7eb9bb79a477e3fb9bf4bcde6033d7aaa8922eee20b6e6a05f49a1aea152a7987b99f335343175d87180062064c90c5a7b5bfa82aed188eeab0ac4a90b
DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82 SHA512 ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
+DIST mutt-gentoo-2.0.0-patches-r0.tar.xz 26396 BLAKE2B 80db2456871208050e5cccbd8ba22024dc45ffc69e9b8cbb892904010f0521061f0755f62984502c2cee58bb74aa0c30fafa4613709d2e8a6d0fe291bbc86e27 SHA512 f9b8f9abded13de54d7fcf991d58fa45e68d6e059c807dcca1530bdb927d7301faa30e31798e5a3f2d25504cb9db81dfa26f8cde3946a14f540f54955add2828
diff --git a/mail-client/mutt/mutt-2.0.0.ebuild b/mail-client/mutt/mutt-2.0.0.ebuild
new file mode 100644
index 00000000000..353c1c707ea
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~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 )
+ 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/libressl >=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
+ 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"
+
+ # https://gitlab.com/muttmua/mutt/-/issues/294
+ sed -i -e 's/u_int32_t/uint32_t/g' mutt_random.c || die
+ 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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-20 18:59 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-11-20 18:59 UTC (permalink / raw
To: gentoo-commits
commit: a444dde143f9c29e5331888ddc10d0139827666f
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 18:59:24 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 18:59:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a444dde1
mail-client/mutt-2.0.2: bump for CVE-2020-28896
Bug: https://bugs.gentoo.org/755866
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.0.0.ebuild => mutt-2.0.2.ebuild} | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 0d5727c40d5..1a31a0f8b3f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,8 @@
DIST mutt-1.14.4.tar.gz 5007437 BLAKE2B 89d4327ddd86ec320c63db6ee9d3c07b7540a74aba7efdcb9605e5c5c242dec99fb5137d1cfc62fd4401e2af7589f03ebce78dfa2deae262aef408b804544656 SHA512 86484f009ca8bd1e26206694e03609a16f8a4e8c83620a07a4376fe160535a838e8c918a8a30799fb3d9cf46c059d67124f7425c42093fb5e5bf8ea4ac310daa
DIST mutt-1.14.5.tar.gz 5008208 BLAKE2B a7c2f7f63d2ee23e743114315cbb40903db720de7f2836f551739edb0b78857c525c40ebde083064dd2430b89b21d7a17745dfc1185672f86b15a9a082c3778e SHA512 950c8df3bdc552b41ba6209aed8d5ade6fff80fe4018a75856d0fdbcd6389bd995a6dee69e7badd05a9b40d2e2293ada9a9f9a96632e88af36b61162f226e2b9
DIST mutt-1.14.7.tar.gz 5009968 BLAKE2B f729412d3da97fe9bd76733705317660edfa3858a9eb1012179fb289b03da58d79b6e261dbdc4ab8b001e89ca455e9972bab8f270bac28e887afc7e0bd9fc8c1 SHA512 dc9739b5f0a99ca70fcbd495c71fbead23e3481f9c9e426feb827997c9c42e5f28355084f54788820c96a079dedb649fcc20e69436fb3c4df7e46f372b533e7c
-DIST mutt-2.0.0.tar.gz 5287742 BLAKE2B d45cae45e560548a3f278972e7bff820c860b194f06286a4e2c456141e7d421b1812f423e31594d0c4b0c82c8c9f597498888a8e127d41b8c172a5319a23cc8e SHA512 2f48bf7eb9bb79a477e3fb9bf4bcde6033d7aaa8922eee20b6e6a05f49a1aea152a7987b99f335343175d87180062064c90c5a7b5bfa82aed188eeab0ac4a90b
+DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
DIST mutt-gentoo-1.14.4-patches-r0.tar.xz 31124 BLAKE2B a9774a5bb5af18a275f7ea171cb08a12a98d63cbff57320d5d3fb4f995aac16f409689ac0015f3b5d37cfc20004c9fca72a3f63663aaa679a129d5f3886bc5cc SHA512 05506399a471c262479db88ef11d2a95d79598fd696fe50de5f5c1c3cae5adf30a2806a1500ba94a62bcbf7deed99acc59a8afb903f50169e41b77010e0ad8cc
DIST mutt-gentoo-1.14.5-patches-r0.tar.xz 31100 BLAKE2B 14525b54afa1414667ebe2dc0c58b9b5d5ad4dcc5dbae3c5db13cc23d33dbd9434fa929ad297625c891b2d690e34729a4f61c526fb94857e271ac85f5a07488e SHA512 fd8e473efa02e412aeaba258afee6dc02f9ca24f9edff643e4ef53c759a091e54c6a544e39cd7faa94cd680546bfcf845e282638045ae65a88d140ebb03a4631
DIST mutt-gentoo-1.14.7-patches-r0.tar.xz 31144 BLAKE2B 5a9806dec79f8a991e39464afde1faf2ba988e67ffd85ec16943432a83ee1d05ddcb839095a475ab56aa80a4bbe25de58835d6bde84c0c95e4487df139e16e82 SHA512 ca57af137bc5a2663724cb97a7ea04e4d62b2fe8a3864489f15552ef361c1fb8c881ebc783a4f3a6d82c5e9bb45e83fbe6cad59158c831c54361729ada24b458
-DIST mutt-gentoo-2.0.0-patches-r0.tar.xz 26396 BLAKE2B 80db2456871208050e5cccbd8ba22024dc45ffc69e9b8cbb892904010f0521061f0755f62984502c2cee58bb74aa0c30fafa4613709d2e8a6d0fe291bbc86e27 SHA512 f9b8f9abded13de54d7fcf991d58fa45e68d6e059c807dcca1530bdb927d7301faa30e31798e5a3f2d25504cb9db81dfa26f8cde3946a14f540f54955add2828
+DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
diff --git a/mail-client/mutt/mutt-2.0.0.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-2.0.0.ebuild
rename to mail-client/mutt/mutt-2.0.2.ebuild
index 353c1c707ea..098178a8242 100644
--- a/mail-client/mutt/mutt-2.0.0.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -97,9 +97,6 @@ src_prepare() {
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"
-
- # https://gitlab.com/muttmua/mutt/-/issues/294
- sed -i -e 's/u_int32_t/uint32_t/g' mutt_random.c || die
fi
local upatches=
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-25 10:28 Thomas Deutschmann
0 siblings, 0 replies; 249+ messages in thread
From: Thomas Deutschmann @ 2020-11-25 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 92c96b80c79fc9c48c624616a6b00df0178617b3
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 10:25:45 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 10:28:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c96b80
mail-client/mutt: x86 stable (bug #755866)
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 098178a8242..c765b55b192 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-25 12:13 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-11-25 12:13 UTC (permalink / raw
To: gentoo-commits
commit: fa19cca5ebef4cdee08ecb9e50376524b30152a5
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 12:12:32 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 12:12:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa19cca5
mail-client/mutt: amd64 stable wrt bug #755866
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index c765b55b192..527890ad969 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-25 12:14 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-11-25 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 07324b59b37da01674f087733d9355f1d7e430e2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 12:13:57 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 12:13:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07324b59
mail-client/mutt: ppc stable wrt bug #755866
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 527890ad969..8d293ab05a7 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-25 12:15 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-11-25 12:15 UTC (permalink / raw
To: gentoo-commits
commit: f75a2fe539c79329c6d979e80257e9962057c020
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 12:15:02 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 12:15:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75a2fe5
mail-client/mutt: sparc stable wrt bug #755866
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 8d293ab05a7..89402e61c99 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-26 6:56 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2020-11-26 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 99f29612759fbfb652fc024ac40eecfd8c702079
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 06:54:27 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 06:54:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f29612
mail-client/mutt: ppc64 stable wrt bug #755866
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 89402e61c99..eb660e10fa0 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-26 8:32 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2020-11-26 8:32 UTC (permalink / raw
To: gentoo-commits
commit: 4eb6f3cb6f9b62fffbf6f9d206e7ce584c5cc964
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 08:28:07 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 08:32:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb6f3cb
mail-client/mutt: Stabilize 2.0.2 arm, #755866
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index eb660e10fa0..6ea867b6524 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-11-26 22:59 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2020-11-26 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 1e93d26c01e529bafcc330be82ec88a8251cb32b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 22:59:23 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:59:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e93d26c
mail-client/mutt: stable 2.0.2 for hppa
stable wrt bug #755866
Package-Manager: Portage-3.0.10, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 6ea867b6524..5747c19c4da 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-12-06 10:45 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-12-06 10:45 UTC (permalink / raw
To: gentoo-commits
commit: e1c6825860450fdcc65ff8cf3bbc1740accb4ba3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 6 10:45:25 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec 6 10:45:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c68258
mail-client/mutt-2.0.3: version bump
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.0.3.ebuild | 265 +++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index ed06d02dd06..f1c7dd8f25d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
+DIST mutt-2.0.3.tar.gz 5292808 BLAKE2B 323a63b1b4ece774674b6f207ae51ffb58e57fd90fa2a44d8a69bb5311bf66318f8d6e8ca20b333bb7e3bea1ef995ab84f1f6cd8486ee91fbfdb90e2d64444b9 SHA512 6511f6690137f2cd8798a6c76a6f1a6305b2ddaad9bf339ec7144f6c249fe9cbcfb5bfbbdd308fcc6829b7fa12132b14d555dd3a9ef9e9b46c9748e2f31be852
DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
+DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
diff --git a/mail-client/mutt/mutt-2.0.3.ebuild b/mail-client/mutt/mutt-2.0.3.ebuild
new file mode 100644
index 00000000000..098178a8242
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.3.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2020-12-31 8:58 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2020-12-31 8:58 UTC (permalink / raw
To: gentoo-commits
commit: 030ea435ed58d50c8fc59da81b55c4796da19e9d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 08:58:29 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 08:58:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030ea435
mail-client/mutt-2.0.4: version bump
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.0.4.ebuild | 265 +++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index f1c7dd8f25d..e802d07e53c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
DIST mutt-2.0.3.tar.gz 5292808 BLAKE2B 323a63b1b4ece774674b6f207ae51ffb58e57fd90fa2a44d8a69bb5311bf66318f8d6e8ca20b333bb7e3bea1ef995ab84f1f6cd8486ee91fbfdb90e2d64444b9 SHA512 6511f6690137f2cd8798a6c76a6f1a6305b2ddaad9bf339ec7144f6c249fe9cbcfb5bfbbdd308fcc6829b7fa12132b14d555dd3a9ef9e9b46c9748e2f31be852
+DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
+DIST mutt-gentoo-2.0.4-patches-r0.tar.xz 26448 BLAKE2B 7f2e2730e18def7281cf59bc783ebc4047e459ebb8796810507ff11f5e99b78c2d6914be154251f1a279b4963156825931e22cd727e86eb40c15637736be457e SHA512 16025a790fba20ba1e693b1b826bf86bd2697d0d3ab5ceaf08b1692902235ef40866daec80862c7082a82a58fa4f9631889688f1d06b864cb29c613725fe5024
diff --git a/mail-client/mutt/mutt-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
new file mode 100644
index 00000000000..098178a8242
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.4.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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 ~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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-06 13:49 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-01-06 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 0adb9f64d120551f3da443d0cd05ad7bde3b4a09
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 13:49:35 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 13:49:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0adb9f64
mail-client/mutt: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-2.0.2.ebuild | 4 ++--
mail-client/mutt/mutt-2.0.3.ebuild | 4 ++--
mail-client/mutt/mutt-2.0.4.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
index 6ea867b6524..b5c1a188f27 100644
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ b/mail-client/mutt/mutt-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/mail-client/mutt/mutt-2.0.3.ebuild b/mail-client/mutt/mutt-2.0.3.ebuild
index 098178a8242..c9a2e340a3c 100644
--- a/mail-client/mutt/mutt-2.0.3.ebuild
+++ b/mail-client/mutt/mutt-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="
diff --git a/mail-client/mutt/mutt-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
index 098178a8242..c9a2e340a3c 100644
--- a/mail-client/mutt/mutt-2.0.4.ebuild
+++ b/mail-client/mutt/mutt-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,7 +27,7 @@ REQUIRED_USE="
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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-18 8:48 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-01-18 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 9ae82eca030da3e91b708e4ede77ddb349b15167
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 08:46:51 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 08:48:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae82eca
mail-client/mutt-2.0.4-r1: revbump with patch for #765790
Bug: https://bugs.gentoo.org/765790
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 +-
.../{mutt-2.0.3.ebuild => mutt-2.0.4-r1.ebuild} | 2 +-
mail-client/mutt/mutt-2.0.4.ebuild | 265 ---------------------
3 files changed, 2 insertions(+), 269 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e802d07e53c..a59f7d021e9 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,4 @@
DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
-DIST mutt-2.0.3.tar.gz 5292808 BLAKE2B 323a63b1b4ece774674b6f207ae51ffb58e57fd90fa2a44d8a69bb5311bf66318f8d6e8ca20b333bb7e3bea1ef995ab84f1f6cd8486ee91fbfdb90e2d64444b9 SHA512 6511f6690137f2cd8798a6c76a6f1a6305b2ddaad9bf339ec7144f6c249fe9cbcfb5bfbbdd308fcc6829b7fa12132b14d555dd3a9ef9e9b46c9748e2f31be852
DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
-DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
-DIST mutt-gentoo-2.0.4-patches-r0.tar.xz 26448 BLAKE2B 7f2e2730e18def7281cf59bc783ebc4047e459ebb8796810507ff11f5e99b78c2d6914be154251f1a279b4963156825931e22cd727e86eb40c15637736be457e SHA512 16025a790fba20ba1e693b1b826bf86bd2697d0d3ab5ceaf08b1692902235ef40866daec80862c7082a82a58fa4f9631889688f1d06b864cb29c613725fe5024
+DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
diff --git a/mail-client/mutt/mutt-2.0.3.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-2.0.3.ebuild
rename to mail-client/mutt/mutt-2.0.4-r1.ebuild
index c9a2e340a3c..5131f8871a1 100644
--- a/mail-client/mutt/mutt-2.0.3.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/mutt/mutt-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
deleted file mode 100644
index c9a2e340a3c..00000000000
--- a/mail-client/mutt/mutt-2.0.4.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- 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? (
- 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 )
- 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/libressl >=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
- 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
- $(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_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}"
- "--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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-22 9:32 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-01-22 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 79206def8f68fecc6f22b793288ada8838db20d5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 09:32:01 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 09:32:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79206def
mail-client/mutt-2.0.5: version bump
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.0.5.ebuild | 265 +++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a59f7d021e9..50745d386af 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
+DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
+DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.5.ebuild
new file mode 100644
index 00000000000..c9a2e340a3c
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.5.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2021 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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? (
+ 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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-24 11:58 Agostino Sarubbo
0 siblings, 0 replies; 249+ messages in thread
From: Agostino Sarubbo @ 2021-01-24 11:58 UTC (permalink / raw
To: gentoo-commits
commit: fcbb6af858fc292f440978f31699f9e1537e2014
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 11:57:51 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 11:57:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcbb6af8
mail-client/mutt: amd64 stable wrt bug #765790
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index 5131f8871a1..cac5b3080d7 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-24 20:06 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-01-24 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 6160c012d7bfda6257a74e95937b16878a0dbbd3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 20:06:07 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 20:06:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6160c012
mail-client/mutt: Stabilize 2.0.4-r1 sparc, #765790
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index a43f193d6c7..bbee0c7d06c 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-24 21:51 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-01-24 21:51 UTC (permalink / raw
To: gentoo-commits
commit: e86ddb207fcd0c63135e5a6862459a745385783d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 21:51:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 21:51:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86ddb20
mail-client/mutt: Stabilize 2.0.4-r1 arm, #765790
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index bbee0c7d06c..d2caaa5b442 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-24 22:04 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-01-24 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 3e019c6eef5b278f810443a115bae5a59a7b40ae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 22:04:06 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 22:04:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e019c6e
mail-client/mutt: Stabilize 2.0.4-r1 ppc64, #765790
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index d2caaa5b442..75740fa71bb 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-24 22:04 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-01-24 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 1eb04dcde0bff4f24577a40bbd1c4dc836c6abc1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 22:04:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 22:04:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb04dcd
mail-client/mutt: Stabilize 2.0.4-r1 ppc, #765790
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index 75740fa71bb..955b557c9d0 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-01-25 7:26 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-01-25 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 15194e17ea34e171a45a9014a6d868e505108c32
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 07:25:17 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 07:25:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15194e17
mail-client/mutt-2.0.2: cleanup vulnerable version
Bug: https://bugs.gentoo.org/765790
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 -
mail-client/mutt/mutt-2.0.2.ebuild | 265 -------------------------------------
2 files changed, 267 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 50745d386af..73bb3449b57 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,4 @@
-DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
-DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
deleted file mode 100644
index b5c1a188f27..00000000000
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- 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? (
- 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 )
- 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/libressl >=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
- 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
- $(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_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}"
- "--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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-03-07 12:06 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-03-07 12:06 UTC (permalink / raw
To: gentoo-commits
commit: ac0d7b220c171fecd8eb99e220375f9a08974055
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 12:04:03 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 12:06:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0d7b22
mail-client/mutt-2.0.6: version bump
Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.0.6.ebuild | 265 +++++++++++++++++++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 73bb3449b57..c0440176cab 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
+DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
+DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732
diff --git a/mail-client/mutt/mutt-2.0.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild
new file mode 100644
index 00000000000..c9a2e340a3c
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.6.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2021 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="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ 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? (
+ 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 )
+ 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/libressl >=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
+ 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
+ $(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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-04-29 18:00 Mikle Kolyada
0 siblings, 0 replies; 249+ messages in thread
From: Mikle Kolyada @ 2021-04-29 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 9e934960a2e588011b2df4533139e7dd4cd11abb
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 17:42:10 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 18:00:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e934960
mail-client/mutt: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 7 ++-----
mail-client/mutt/mutt-2.0.5.ebuild | 7 ++-----
mail-client/mutt/mutt-2.0.6.ebuild | 7 ++-----
3 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index 1d6c9b105ef..af6177a467a 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -14,7 +14,7 @@ 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 +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +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="
hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
@@ -42,11 +42,8 @@ CDEPEND="
ssl? (
gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- libressl? ( dev-libs/libressl:= )
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
)
- )
nls? ( virtual/libintl )
sasl? ( >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.5.ebuild
index 5cec641f391..ada7c0b9d3a 100644
--- a/mail-client/mutt/mutt-2.0.5.ebuild
+++ b/mail-client/mutt/mutt-2.0.5.ebuild
@@ -14,7 +14,7 @@ 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 +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +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="
hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
@@ -42,11 +42,8 @@ CDEPEND="
ssl? (
gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- libressl? ( dev-libs/libressl:= )
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
)
- )
nls? ( virtual/libintl )
sasl? ( >=dev-libs/cyrus-sasl-2 )
diff --git a/mail-client/mutt/mutt-2.0.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild
index 5cec641f391..ada7c0b9d3a 100644
--- a/mail-client/mutt/mutt-2.0.6.ebuild
+++ b/mail-client/mutt/mutt-2.0.6.ebuild
@@ -14,7 +14,7 @@ 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 +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +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="
hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
@@ -42,11 +42,8 @@ CDEPEND="
ssl? (
gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- libressl? ( dev-libs/libressl:= )
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
+ !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
)
- )
nls? ( virtual/libintl )
sasl? ( >=dev-libs/cyrus-sasl-2 )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-04-30 23:27 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-04-30 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 3456acfe2a6e60b1042a4463973415846ccbbaed
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 18:28:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 23:27:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3456acfe
mail-client/mutt: remove other LibreSSL references
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.4-r1.ebuild | 2 +-
mail-client/mutt/mutt-2.0.5.ebuild | 2 +-
mail-client/mutt/mutt-2.0.6.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index af6177a467a..75406cb03c5 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -64,7 +64,7 @@ DEPEND="${CDEPEND}
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-mutt )
- smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+ smime-classic? ( >=dev-libs/openssl-0.9.6:0 )
pgp-classic? ( app-crypt/gnupg )
"
diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.5.ebuild
index ada7c0b9d3a..a3813e61551 100644
--- a/mail-client/mutt/mutt-2.0.5.ebuild
+++ b/mail-client/mutt/mutt-2.0.5.ebuild
@@ -64,7 +64,7 @@ DEPEND="${CDEPEND}
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-mutt )
- smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+ smime-classic? ( >=dev-libs/openssl-0.9.6:0 )
pgp-classic? ( app-crypt/gnupg )
"
diff --git a/mail-client/mutt/mutt-2.0.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild
index ada7c0b9d3a..a3813e61551 100644
--- a/mail-client/mutt/mutt-2.0.6.ebuild
+++ b/mail-client/mutt/mutt-2.0.6.ebuild
@@ -64,7 +64,7 @@ DEPEND="${CDEPEND}
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-mutt )
- smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+ smime-classic? ( >=dev-libs/openssl-0.9.6:0 )
pgp-classic? ( app-crypt/gnupg )
"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-04 20:08 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-05-04 20:08 UTC (permalink / raw
To: gentoo-commits
commit: a4bcf0e7d6be95d1c34a034a7113bf1cffae19ba
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 20:07:45 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 4 20:08:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bcf0e7
mail-client/mutt-2.0.7: version bump
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.0.5.ebuild => mutt-2.0.7.ebuild} | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index c0440176cab..b7d0e2cc9dc 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
-DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
+DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
-DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732
+DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
diff --git a/mail-client/mutt/mutt-2.0.5.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
similarity index 97%
rename from mail-client/mutt/mutt-2.0.5.ebuild
rename to mail-client/mutt/mutt-2.0.7.ebuild
index a3813e61551..28cffe8c94b 100644
--- a/mail-client/mutt/mutt-2.0.5.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit epatch flag-o-matic autotools
+inherit flag-o-matic autotools
PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
@@ -73,8 +73,6 @@ src_prepare() {
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
@@ -83,12 +81,13 @@ src_prepare() {
features-extra
gentoo
)
- local patchset
+ local patchset p
for patchset in "${patches[@]}" ; do
[[ -d "${PATCHDIR}/${patchset}" ]] || continue
einfo "Patches for ${PATCHSET} patchset ${patchset}"
- EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
- || die "patchset ${patchset} failed"
+ for p in "${PATCHDIR}/${patchset}"/*.patch ; do
+ eapply "${p}" || die
+ done
done
# add some explanation as to why not to go upstream
sed -i \
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-06 10:04 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-05-06 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 67e27eb4b8741cbf261f811a4a103a84d7c67c7d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 10:03:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 10:03:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e27eb4
mail-client/mutt: Stabilize 2.0.7 amd64, #788388
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index 28cffe8c94b..5f76a11c5ef 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-06 10:06 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-05-06 10:06 UTC (permalink / raw
To: gentoo-commits
commit: 85e47c3c16de0fd626e6579f01c66159905c5ee4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 10:05:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 10:05:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e47c3c
mail-client/mutt: Stabilize 2.0.7 x86, #788388
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index 5f76a11c5ef..1be3bbdd12a 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-06 15:30 Sergei Trofimovich
0 siblings, 0 replies; 249+ messages in thread
From: Sergei Trofimovich @ 2021-05-06 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 15a6b9e9b6051bb48aed8ccb068a131cd9bb1240
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu May 6 13:54:43 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May 6 15:29:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a6b9e9
mail-client/mutt: stable 2.0.7 for sparc, bug #788388
Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
mail-client/mutt/mutt-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index 1be3bbdd12a..f6ea41b81b5 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-06 21:20 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-05-06 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 9462a428885f04dad81f6ccb0bbc0c893301c024
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 21:20:24 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 21:20:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9462a428
mail-client/mutt: Stabilize 2.0.7 arm, #788388
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index f6ea41b81b5..33c5cc5596f 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-06 21:22 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-05-06 21:22 UTC (permalink / raw
To: gentoo-commits
commit: b3aa6d51c10563e7a195557982e0d4da52a31aa9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 6 21:22:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 6 21:22:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3aa6d51
mail-client/mutt: Stabilize 2.0.7 ppc64, #788388
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index 33c5cc5596f..54619918201 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-07 13:33 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2021-05-07 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 8ee4278ebd73d0b40217ef1198b1ba7283c0c107
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 7 13:33:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 7 13:33:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee4278e
mail-client/mutt: Stabilize 2.0.7 ppc, #788388
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.0.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index 54619918201..0c29057fb2b 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-05-07 13:42 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-05-07 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 20d61bcf9a07b2840b1b36041c892e54a9bb3669
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri May 7 13:41:57 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri May 7 13:41:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d61bcf
mail-client/mutt: cleanup
Bug: https://bugs.gentoo.org/788388
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 -
mail-client/mutt/mutt-2.0.4-r1.ebuild | 262 ----------------------------------
mail-client/mutt/mutt-2.0.6.ebuild | 262 ----------------------------------
3 files changed, 528 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b7d0e2cc9dc..fd297c8e166 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,2 @@
-DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
-DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
-DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
deleted file mode 100644
index 75406cb03c5..00000000000
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit epatch flag-o-matic autotools
-
-PATCHREV="r1"
-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 +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="
- 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? ( >=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
- 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
- $(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_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}"
- "--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
-}
diff --git a/mail-client/mutt/mutt-2.0.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild
deleted file mode 100644
index a3813e61551..00000000000
--- a/mail-client/mutt/mutt-2.0.6.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit epatch 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 +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="
- 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? ( >=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
- 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
- $(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_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}"
- "--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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-06-13 10:31 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-06-13 10:31 UTC (permalink / raw
To: gentoo-commits
commit: 8eff4d036291c6155be8aafc0935ab9df3f4afc8
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 13 10:30:50 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 13 10:30:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eff4d03
mail-client/mutt-2.1.0: version bump
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.1.0.ebuild | 261 +++++++++++++++++++++++++++++++++++++
2 files changed, 263 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index fd297c8e166..3fa7d2b8d85 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
+DIST mutt-2.1.0.tar.gz 5405519 BLAKE2B cb7c08f6a27376abed26a208f7c3a756046cfdf40967dd8222aec3655e33ae85e2a450ddf98ff454601b19e6672c1168a8d19e479f15745213dc971e250de688 SHA512 b4bcbb9d02712f211e2cb1542e1e8a5e09648fc22f724ff771f1e99d2016fb258d64d3384740427c9fe731cff8817f633f0034329ad2d7dd505b0689ccc9499c
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
+DIST mutt-gentoo-2.1.0-patches-r0.tar.xz 25928 BLAKE2B 8b16e856ef4c19d5f9e10d747390f03b3b26619671999ef9a39c222496da9976fc82362f15168dc1913480dbe1ffce33847ee7df1d6f1a1df6e8fff2697f3c45 SHA512 8b95be60b8fbbe9c1faf861e483b7627ccb2e5db97c6b18c6017d5aa6bb3d49b791a5c2aa3bf1fa2f1342690f5c81a887f4fbef25fa7d649cf182187c15fa663
diff --git a/mail-client/mutt/mutt-2.1.0.ebuild b/mail-client/mutt/mutt-2.1.0.ebuild
new file mode 100644
index 00000000000..28cffe8c94b
--- /dev/null
+++ b/mail-client/mutt/mutt-2.1.0.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2021 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 +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="
+ 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? ( >=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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-07-13 17:02 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-07-13 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 72e1f5979dc65231d78167eb47eceffae3077075
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 06:46:53 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 17:00:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e1f597
mail-client/mutt-2.1.1: version bump
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.1.1.ebuild | 261 +++++++++++++++++++++++++++++++++++++
2 files changed, 263 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 3fa7d2b8d85..10890bd1975 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
DIST mutt-2.1.0.tar.gz 5405519 BLAKE2B cb7c08f6a27376abed26a208f7c3a756046cfdf40967dd8222aec3655e33ae85e2a450ddf98ff454601b19e6672c1168a8d19e479f15745213dc971e250de688 SHA512 b4bcbb9d02712f211e2cb1542e1e8a5e09648fc22f724ff771f1e99d2016fb258d64d3384740427c9fe731cff8817f633f0034329ad2d7dd505b0689ccc9499c
+DIST mutt-2.1.1.tar.gz 5406187 BLAKE2B c27bae8d4a050026282cd373e747d6406cbbc3c6bbc3f2463580ec76ad104629e6429d68a70f59e570c9b2d4b53c8a92d767fd53746e251a0713a920df5c29ff SHA512 8ae69353b820d97186996aec83a77722f4e0a45f881e1893ab93a2f183baf9087c0d3d7ff0d1596853617be27670cc36a2fa88b141860080e7ffd47d59ddb1a8
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
DIST mutt-gentoo-2.1.0-patches-r0.tar.xz 25928 BLAKE2B 8b16e856ef4c19d5f9e10d747390f03b3b26619671999ef9a39c222496da9976fc82362f15168dc1913480dbe1ffce33847ee7df1d6f1a1df6e8fff2697f3c45 SHA512 8b95be60b8fbbe9c1faf861e483b7627ccb2e5db97c6b18c6017d5aa6bb3d49b791a5c2aa3bf1fa2f1342690f5c81a887f4fbef25fa7d649cf182187c15fa663
+DIST mutt-gentoo-2.1.1-patches-r0.tar.xz 25880 BLAKE2B 21092f17f7d4b96c9f7b50afc620995ffae0cdb382fbe73d91252105db0989bdb9208e48d031e127fce2431e637af537ab216bb4a1c6c20b402c58282ab93dd1 SHA512 69ca83a62b2b8a7461aae4f1e78cdec3b315d635716ff89f9a37db36fcf57b5323d459c9ad4885978018076118da62901a5f79ac29709e9e7dfddd2570c90c64
diff --git a/mail-client/mutt/mutt-2.1.1.ebuild b/mail-client/mutt/mutt-2.1.1.ebuild
new file mode 100644
index 00000000000..28cffe8c94b
--- /dev/null
+++ b/mail-client/mutt/mutt-2.1.1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2021 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 +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="
+ 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? ( >=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_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}"
+ "--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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-08-26 5:14 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-08-26 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 73a7cedab2c2edf669bcffedac92086be9547465
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 05:08:05 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 05:14:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a7ceda
mail-client/mutt-2.1.2: version bump
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.1.0.ebuild => mutt-2.1.2.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 10890bd1975..8ebc6a0f4c4 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.1.0.tar.gz 5405519 BLAKE2B cb7c08f6a27376abed26a208f7c3a756046cfdf40967dd8222aec3655e33ae85e2a450ddf98ff454601b19e6672c1168a8d19e479f15745213dc971e250de688 SHA512 b4bcbb9d02712f211e2cb1542e1e8a5e09648fc22f724ff771f1e99d2016fb258d64d3384740427c9fe731cff8817f633f0034329ad2d7dd505b0689ccc9499c
DIST mutt-2.1.1.tar.gz 5406187 BLAKE2B c27bae8d4a050026282cd373e747d6406cbbc3c6bbc3f2463580ec76ad104629e6429d68a70f59e570c9b2d4b53c8a92d767fd53746e251a0713a920df5c29ff SHA512 8ae69353b820d97186996aec83a77722f4e0a45f881e1893ab93a2f183baf9087c0d3d7ff0d1596853617be27670cc36a2fa88b141860080e7ffd47d59ddb1a8
+DIST mutt-2.1.2.tar.gz 5404858 BLAKE2B 6e05284fce590c06eccebb909403a6c9f5a4edd29d58373740445f52afdd48d44faf7794990dc96b08bfa35a075abf18ef0bda2624ec43cf5bb3567b0270a0dc SHA512 39db1c0f4b3b716fb6314f2fb05dbff3c619bc4fbe7ce66b2f9681163b96b5cc23edab37c3a35cd143532281aafceae6057a7ab45f78f266a22816478938e242
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.1.0-patches-r0.tar.xz 25928 BLAKE2B 8b16e856ef4c19d5f9e10d747390f03b3b26619671999ef9a39c222496da9976fc82362f15168dc1913480dbe1ffce33847ee7df1d6f1a1df6e8fff2697f3c45 SHA512 8b95be60b8fbbe9c1faf861e483b7627ccb2e5db97c6b18c6017d5aa6bb3d49b791a5c2aa3bf1fa2f1342690f5c81a887f4fbef25fa7d649cf182187c15fa663
DIST mutt-gentoo-2.1.1-patches-r0.tar.xz 25880 BLAKE2B 21092f17f7d4b96c9f7b50afc620995ffae0cdb382fbe73d91252105db0989bdb9208e48d031e127fce2431e637af537ab216bb4a1c6c20b402c58282ab93dd1 SHA512 69ca83a62b2b8a7461aae4f1e78cdec3b315d635716ff89f9a37db36fcf57b5323d459c9ad4885978018076118da62901a5f79ac29709e9e7dfddd2570c90c64
+DIST mutt-gentoo-2.1.2-patches-r0.tar.xz 25848 BLAKE2B 2ba0d790a49b78c63f378a230303731508bc633fb97c2c10fe940b56622c9d616c3467e3e7c3773f45cae942341c48dd3492b85bb09c1a52fd664501d285653a SHA512 fa489535a9900d214ba5b5fea0f93976e222d37a7d249f4548932364047471b81e59a66beb877d924a938ad4799e1ecc7d634bb2c6e3dc5492fd6feac7c38b55
diff --git a/mail-client/mutt/mutt-2.1.0.ebuild b/mail-client/mutt/mutt-2.1.2.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.1.0.ebuild
rename to mail-client/mutt/mutt-2.1.2.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-09-23 6:03 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-09-23 6:03 UTC (permalink / raw
To: gentoo-commits
commit: b8f45a9b36de8f38fb4861abc45d03b159b922c2
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 17:44:33 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 06:03:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f45a9b
mail-client/mutt-2.1.3: version bump
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.1.1.ebuild => mutt-2.1.3.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8ebc6a0f4c4..98432ffb781 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.1.1.tar.gz 5406187 BLAKE2B c27bae8d4a050026282cd373e747d6406cbbc3c6bbc3f2463580ec76ad104629e6429d68a70f59e570c9b2d4b53c8a92d767fd53746e251a0713a920df5c29ff SHA512 8ae69353b820d97186996aec83a77722f4e0a45f881e1893ab93a2f183baf9087c0d3d7ff0d1596853617be27670cc36a2fa88b141860080e7ffd47d59ddb1a8
DIST mutt-2.1.2.tar.gz 5404858 BLAKE2B 6e05284fce590c06eccebb909403a6c9f5a4edd29d58373740445f52afdd48d44faf7794990dc96b08bfa35a075abf18ef0bda2624ec43cf5bb3567b0270a0dc SHA512 39db1c0f4b3b716fb6314f2fb05dbff3c619bc4fbe7ce66b2f9681163b96b5cc23edab37c3a35cd143532281aafceae6057a7ab45f78f266a22816478938e242
+DIST mutt-2.1.3.tar.gz 5408941 BLAKE2B 2754f2f5ebc5d940d28ab9ef396193e1f948ca23c3818026d81db712da6857c4e1115aa00bc914ae3831e2dfdd930f8a4df3cc0995b4e10a587e4de4bbfda31b SHA512 43b1ce3c9c62ccf7845fa3ae99936562890877626b8f8e8997c63a5f28347b1e69cb891fdb6f7e4d1c10962e0d40a186cb4cb41a7aa3a8c3966bbde10165394b
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.1.1-patches-r0.tar.xz 25880 BLAKE2B 21092f17f7d4b96c9f7b50afc620995ffae0cdb382fbe73d91252105db0989bdb9208e48d031e127fce2431e637af537ab216bb4a1c6c20b402c58282ab93dd1 SHA512 69ca83a62b2b8a7461aae4f1e78cdec3b315d635716ff89f9a37db36fcf57b5323d459c9ad4885978018076118da62901a5f79ac29709e9e7dfddd2570c90c64
DIST mutt-gentoo-2.1.2-patches-r0.tar.xz 25848 BLAKE2B 2ba0d790a49b78c63f378a230303731508bc633fb97c2c10fe940b56622c9d616c3467e3e7c3773f45cae942341c48dd3492b85bb09c1a52fd664501d285653a SHA512 fa489535a9900d214ba5b5fea0f93976e222d37a7d249f4548932364047471b81e59a66beb877d924a938ad4799e1ecc7d634bb2c6e3dc5492fd6feac7c38b55
+DIST mutt-gentoo-2.1.3-patches-r0.tar.xz 25836 BLAKE2B a20f669eebe126aacf548928567da7b32efded6166c880cc429875c31691e4941fb4cf765c0db8c2e24bd42b59e4ddf2b3875953a8ab1424ea48891690c51a15 SHA512 96d905d0f0195fcdf2efbc0a2fd2c8d312f13e1d9378930a1ddf4ea79b50b673e47c1bec6f4337240c0c2c0f8208ecfa8e4b05b7c6980d0857e9f6e6ec842328
diff --git a/mail-client/mutt/mutt-2.1.1.ebuild b/mail-client/mutt/mutt-2.1.3.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.1.1.ebuild
rename to mail-client/mutt/mutt-2.1.3.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-12-13 7:03 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-12-13 7:03 UTC (permalink / raw
To: gentoo-commits
commit: 374688ec99b1d5713370185ab694c635ac7f9b08
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 09:04:09 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 07:03:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374688ec
mail-client/mutt-2.1.4: version bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.1.2.ebuild => mutt-2.1.4.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 98432ffb781e..6043d0156187 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.1.2.tar.gz 5404858 BLAKE2B 6e05284fce590c06eccebb909403a6c9f5a4edd29d58373740445f52afdd48d44faf7794990dc96b08bfa35a075abf18ef0bda2624ec43cf5bb3567b0270a0dc SHA512 39db1c0f4b3b716fb6314f2fb05dbff3c619bc4fbe7ce66b2f9681163b96b5cc23edab37c3a35cd143532281aafceae6057a7ab45f78f266a22816478938e242
DIST mutt-2.1.3.tar.gz 5408941 BLAKE2B 2754f2f5ebc5d940d28ab9ef396193e1f948ca23c3818026d81db712da6857c4e1115aa00bc914ae3831e2dfdd930f8a4df3cc0995b4e10a587e4de4bbfda31b SHA512 43b1ce3c9c62ccf7845fa3ae99936562890877626b8f8e8997c63a5f28347b1e69cb891fdb6f7e4d1c10962e0d40a186cb4cb41a7aa3a8c3966bbde10165394b
+DIST mutt-2.1.4.tar.gz 5407563 BLAKE2B 3ae0cdfb59afdfa8ba930fb11a4acb195783be7b47cd100ecb11a99e448ff72ae0fd96503fcfec15d55f041e32010e1596f654b75482ca4741c07cd0f883dd57 SHA512 621240fdecb65ed2d63d6a4cbe134c4ec40486cb4aa3a02649ff822a87c01732e513f403380dc9c7d3840220dde55a6fb13bb9c05b511b9b33965f599ffb2798
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.1.2-patches-r0.tar.xz 25848 BLAKE2B 2ba0d790a49b78c63f378a230303731508bc633fb97c2c10fe940b56622c9d616c3467e3e7c3773f45cae942341c48dd3492b85bb09c1a52fd664501d285653a SHA512 fa489535a9900d214ba5b5fea0f93976e222d37a7d249f4548932364047471b81e59a66beb877d924a938ad4799e1ecc7d634bb2c6e3dc5492fd6feac7c38b55
DIST mutt-gentoo-2.1.3-patches-r0.tar.xz 25836 BLAKE2B a20f669eebe126aacf548928567da7b32efded6166c880cc429875c31691e4941fb4cf765c0db8c2e24bd42b59e4ddf2b3875953a8ab1424ea48891690c51a15 SHA512 96d905d0f0195fcdf2efbc0a2fd2c8d312f13e1d9378930a1ddf4ea79b50b673e47c1bec6f4337240c0c2c0f8208ecfa8e4b05b7c6980d0857e9f6e6ec842328
+DIST mutt-gentoo-2.1.4-patches-r0.tar.xz 25840 BLAKE2B 9507c2fdc0297965cca11ea7ae2317daaf5ac24cba8f4477da562c2a1c6ccf50242137efbabd8037c9442a34652df318ea58eb126e14bfbd04d21384d72df248 SHA512 51b9d670321a868fbee33cc36921a8e2ba5fb428e741d1dbf8e6f52123bce44dfcd001897277f660f4ebdc1c51af968757bca6de5b2fb12818a9f5f964a5aecb
diff --git a/mail-client/mutt/mutt-2.1.2.ebuild b/mail-client/mutt/mutt-2.1.4.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.1.2.ebuild
rename to mail-client/mutt/mutt-2.1.4.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2021-12-31 9:57 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2021-12-31 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 7a5589d6baf14ec81160e29b8558763e048bd318
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 09:56:44 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 09:57:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5589d6
mail-client/mutt-2.1.5: version bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.1.3.ebuild => mutt-2.1.5.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6043d0156187..cf7a3a57178c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.1.3.tar.gz 5408941 BLAKE2B 2754f2f5ebc5d940d28ab9ef396193e1f948ca23c3818026d81db712da6857c4e1115aa00bc914ae3831e2dfdd930f8a4df3cc0995b4e10a587e4de4bbfda31b SHA512 43b1ce3c9c62ccf7845fa3ae99936562890877626b8f8e8997c63a5f28347b1e69cb891fdb6f7e4d1c10962e0d40a186cb4cb41a7aa3a8c3966bbde10165394b
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-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.1.3-patches-r0.tar.xz 25836 BLAKE2B a20f669eebe126aacf548928567da7b32efded6166c880cc429875c31691e4941fb4cf765c0db8c2e24bd42b59e4ddf2b3875953a8ab1424ea48891690c51a15 SHA512 96d905d0f0195fcdf2efbc0a2fd2c8d312f13e1d9378930a1ddf4ea79b50b673e47c1bec6f4337240c0c2c0f8208ecfa8e4b05b7c6980d0857e9f6e6ec842328
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
diff --git a/mail-client/mutt/mutt-2.1.3.ebuild b/mail-client/mutt/mutt-2.1.5.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.1.3.ebuild
rename to mail-client/mutt/mutt-2.1.5.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-02-13 9:51 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-02-13 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 1c0a2faf515428f6bad9421aa8ec1a3ffc9a8f4a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 09:50:49 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 09:50:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0a2faf
mail-client/mutt-2.2.0: version bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/metadata.xml | 2 +
mail-client/mutt/mutt-2.2.0.ebuild | 268 +++++++++++++++++++++++++++++++++++++
3 files changed, 272 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cf7a3a57178c..d64a792b4e5c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,8 @@
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.0.tar.gz 5503348 BLAKE2B 7a47ed1716a527b8dcd846fcecf7fd9b6e99b2f7af4fa04ac4a6ae83758e25fa67c712c44f6a9093d0a04c9e46bac1c33114380ac00f2a8351cd71d3ba4e70ab SHA512 91046063f0b3d670a2f7a8f38b291618caedb6ecd7290c71868bc45fffe4c8e7e560d91a13f797f74a9a5fabb26e61963566deaf4699ca0f582deb949016273e
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.0-patches-r0.tar.xz 23208 BLAKE2B 84034ff94874d91ca79097918dc6a5b34592d419385dd82e9f3777dae79139a8935d9714da80af44e7634becf12ceae9f24d453386f35e470903a2789cee7d1b SHA512 2d61c14dad8425b2f176817dabd1a7810719a7da703a810a8eca3c0bf8cb8c43d36e83f9f0b5a36bceb871b74daca3ed4eec0f6b33d1b2aa4d6349b8a764a149
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</flag>
<flag name="gdbm">Enable <pkg>sys-libs/gdbm</pkg> database backend
for header caching</flag>
+ <flag name="gsasl">Use GNU SASL via <pkg>virtual/gsasl</pkg> instead
+ of Cyrus SASL (requires USE=sasl)</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
diff --git a/mail-client/mutt/mutt-2.2.0.ebuild b/mail-client/mutt/mutt-2.2.0.ebuild
new file mode 100644
index 000000000000..9217536891d9
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.0.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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-02-20 8:29 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-02-20 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 0f9c7b0d746d35f8b5799336ed7ff38140393664
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 08:28:40 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 08:29:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9c7b0d
mail-client/mutt-2.2.1: version bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.0.ebuild => mutt-2.2.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d64a792b4e5c..d9552f325e8c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,8 @@
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.0.tar.gz 5503348 BLAKE2B 7a47ed1716a527b8dcd846fcecf7fd9b6e99b2f7af4fa04ac4a6ae83758e25fa67c712c44f6a9093d0a04c9e46bac1c33114380ac00f2a8351cd71d3ba4e70ab SHA512 91046063f0b3d670a2f7a8f38b291618caedb6ecd7290c71868bc45fffe4c8e7e560d91a13f797f74a9a5fabb26e61963566deaf4699ca0f582deb949016273e
+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.0-patches-r0.tar.xz 23208 BLAKE2B 84034ff94874d91ca79097918dc6a5b34592d419385dd82e9f3777dae79139a8935d9714da80af44e7634becf12ceae9f24d453386f35e470903a2789cee7d1b SHA512 2d61c14dad8425b2f176817dabd1a7810719a7da703a810a8eca3c0bf8cb8c43d36e83f9f0b5a36bceb871b74daca3ed4eec0f6b33d1b2aa4d6349b8a764a149
+DIST mutt-gentoo-2.2.1-patches-r0.tar.xz 23164 BLAKE2B 755a5904fd68a577c96d78a311b5cd0713df4fa884c18c14ca4c88c48b56997a6372af32391201843e7aa8a7cb9cd7002105f217f42c9dec46073e2fe3ccf1bc SHA512 5d022aa2a2ee83f394c52957ad958ba8739fa9395d8ea7c96c1f1138b9df4413ff9e3209e36741666549232e5595cae77bf04ce180e34fac34594a2886084e6d
diff --git a/mail-client/mutt/mutt-2.2.0.ebuild b/mail-client/mutt/mutt-2.2.1.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.2.0.ebuild
rename to mail-client/mutt/mutt-2.2.1.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-03-28 10:03 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-03-28 10:03 UTC (permalink / raw
To: gentoo-commits
commit: bc1da911fe2d0180be333cf083790605b5788b0c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 10:02:46 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 10:02:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1da911
mail-client/mutt-2.2.2: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 6 +-
mail-client/mutt/mutt-2.1.5.ebuild | 261 ---------------------
.../mutt/{mutt-2.1.4.ebuild => mutt-2.2.2.ebuild} | 19 +-
3 files changed, 15 insertions(+), 271 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d9552f325e8c..715b4bedd19f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,8 +1,6 @@
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-2.2.2.tar.gz 5507066 BLAKE2B dd23e2e75b1656ac0351d10df266432820dd32acd44310e586f8c5deec187648e61c7b9e880bcbbaa09a9d6e8bd67b205f43284a729ae6ff95adb4e2bc15724a SHA512 da236c535a4dd18ed92f4b226a009711098c87cc28bbcf3abcd5f31f3ac074abe830f4f7c98cc8cda738a7a6d9421a088915094b33e53e32e9649ccccefe3481
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
+DIST mutt-gentoo-2.2.2-patches-r0.tar.xz 23160 BLAKE2B 2bc09d2aa67102b382c2466773868ba32f38827e44efc7ee2461fa592607a926547013f6c232ac2d6d0cd7dc07da386a0995c7819273b4c96c28a1a6140248a4 SHA512 3b45957d92a9d3f2c185965d226c137dcbb11eb58e497a4dc5ab49041eba79c7436b8239ceb625e32ef0453b7909d925a6238ec75dfa3f267eea46e86474758a
diff --git a/mail-client/mutt/mutt-2.1.5.ebuild b/mail-client/mutt/mutt-2.1.5.ebuild
deleted file mode 100644
index 28cffe8c94b4..000000000000
--- a/mail-client/mutt/mutt-2.1.5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2021 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 +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="
- 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? ( >=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_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}"
- "--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
-}
diff --git a/mail-client/mutt/mutt-2.1.4.ebuild b/mail-client/mutt/mutt-2.2.2.ebuild
similarity index 92%
rename from mail-client/mutt/mutt-2.1.4.ebuild
rename to mail-client/mutt/mutt-2.2.2.ebuild
index 28cffe8c94b4..9217536891d9 100644
--- a/mail-client/mutt/mutt-2.1.4.ebuild
+++ b/mail-client/mutt/mutt-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -14,9 +14,10 @@ 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 +hcache idn +imap kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+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 )
@@ -42,11 +43,14 @@ CDEPEND="
ssl? (
gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
- )
+ !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+ )
nls? ( virtual/libintl )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sasl? (
+ gsasl? ( virtual/gsasl )
+ !gsasl? ( >=dev-libs/cyrus-sasl-2 )
+ )
kerberos? ( virtual/krb5 )
idn? ( net-dns/libidn2 )
gpgme? ( >=app-crypt/gpgme-0.9.0:= )
@@ -135,7 +139,10 @@ src_configure() {
$(use ssl && use !gnutls && echo --without-gnutls --with-ssl )
$(use !ssl && echo --without-gnutls --without-ssl)
- $(use_with sasl)
+ $(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)"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-15 6:59 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-04-15 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 0bd35626dad2379fc630655757fe83a65261d1f5
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 06:58:26 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 06:59:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd35626
mail-client/mutt-2.2.3: security version bump
Bug: https://bugs.gentoo.org/838379
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.1.ebuild => mutt-2.2.3.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 715b4bedd19f..d60e3d0c2992 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.2.1.tar.gz 5503979 BLAKE2B 304dee7e24dcff896e1a12b0eb0f6bb4ccd58067249fd5090f53d0e55dd401f16b037e7519b07e465ccba6c177113ab1f00e1e3983d0f3345be392bccbe2f43b SHA512 2dd29a095698b7bb98dd5631a507ac1eb655d5db22d0e2506dea5d91663483aefb722e99ba8ad53f4e776189163d5339bba03ec41182c13aa9d665ba321f0941
DIST mutt-2.2.2.tar.gz 5507066 BLAKE2B dd23e2e75b1656ac0351d10df266432820dd32acd44310e586f8c5deec187648e61c7b9e880bcbbaa09a9d6e8bd67b205f43284a729ae6ff95adb4e2bc15724a SHA512 da236c535a4dd18ed92f4b226a009711098c87cc28bbcf3abcd5f31f3ac074abe830f4f7c98cc8cda738a7a6d9421a088915094b33e53e32e9649ccccefe3481
+DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.2.1-patches-r0.tar.xz 23164 BLAKE2B 755a5904fd68a577c96d78a311b5cd0713df4fa884c18c14ca4c88c48b56997a6372af32391201843e7aa8a7cb9cd7002105f217f42c9dec46073e2fe3ccf1bc SHA512 5d022aa2a2ee83f394c52957ad958ba8739fa9395d8ea7c96c1f1138b9df4413ff9e3209e36741666549232e5595cae77bf04ce180e34fac34594a2886084e6d
DIST mutt-gentoo-2.2.2-patches-r0.tar.xz 23160 BLAKE2B 2bc09d2aa67102b382c2466773868ba32f38827e44efc7ee2461fa592607a926547013f6c232ac2d6d0cd7dc07da386a0995c7819273b4c96c28a1a6140248a4 SHA512 3b45957d92a9d3f2c185965d226c137dcbb11eb58e497a4dc5ab49041eba79c7436b8239ceb625e32ef0453b7909d925a6238ec75dfa3f267eea46e86474758a
+DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
diff --git a/mail-client/mutt/mutt-2.2.1.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.2.1.ebuild
rename to mail-client/mutt/mutt-2.2.3.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-19 8:53 Jakov Smolić
0 siblings, 0 replies; 249+ messages in thread
From: Jakov Smolić @ 2022-04-19 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 2bf9776f3adfaff3f03dcf39d6b94aa0d4fa8a47
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 08:52:49 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 08:52:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf9776f
mail-client/mutt: Stabilize 2.2.3 amd64, #839393
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index 9217536891d9..75b326418878 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-19 12:13 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2022-04-19 12:13 UTC (permalink / raw
To: gentoo-commits
commit: fa571d887806dbf2a4ce525d28a5d84923fc937a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 12:12:59 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 12:12:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa571d88
mail-client/mutt: Stabilize 2.2.3 sparc, #839393
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index 75b326418878..7829739861e4 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-19 13:35 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2022-04-19 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 82a78a2ad0e34832d34b231a810ba53443ecbd26
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 13:35:42 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 13:35:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a78a2a
mail-client/mutt: Stabilize 2.2.3 ppc, #839393
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index 7829739861e4..48122ffba120 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-19 13:46 Jakov Smolić
0 siblings, 0 replies; 249+ messages in thread
From: Jakov Smolić @ 2022-04-19 13:46 UTC (permalink / raw
To: gentoo-commits
commit: 44698bdc55f9d8b3802bac1e8ad6c1df9a0258d3
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 13:45:23 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 13:45:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44698bdc
mail-client/mutt: Stabilize 2.2.3 x86, #839393
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index 48122ffba120..b88f46543037 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-19 16:43 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2022-04-19 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 1b2d04b92f81fe94a63fe40bf7ceb812b20ccd96
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 16:43:29 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 16:43:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b2d04b9
mail-client/mutt: Stabilize 2.2.3 ppc64, #839393
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index b88f46543037..d57521306815 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-27 4:34 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2022-04-27 4:34 UTC (permalink / raw
To: gentoo-commits
commit: f3d659e7c144ea5e00d000332c3f197ec00865b1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 04:33:57 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 04:33:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d659e7
mail-client/mutt: Stabilize 2.2.3 arm, #839393
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index d57521306815..95c8d5c0d5c1 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-27 15:49 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-04-27 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 7222a2e6cc034c69ed7ebf194d5918d71cbb9c5a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 15:48:08 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 15:49:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7222a2e6
mail-client/mutt: cleanup vulnerable versions
Bug: https://bugs.gentoo.org/838379
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 -
mail-client/mutt/mutt-2.0.7.ebuild | 261 ------------------------------------
mail-client/mutt/mutt-2.2.2.ebuild | 268 -------------------------------------
3 files changed, 533 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d60e3d0c2992..72e1fa7afd72 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,2 @@
-DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-2.2.2.tar.gz 5507066 BLAKE2B dd23e2e75b1656ac0351d10df266432820dd32acd44310e586f8c5deec187648e61c7b9e880bcbbaa09a9d6e8bd67b205f43284a729ae6ff95adb4e2bc15724a SHA512 da236c535a4dd18ed92f4b226a009711098c87cc28bbcf3abcd5f31f3ac074abe830f4f7c98cc8cda738a7a6d9421a088915094b33e53e32e9649ccccefe3481
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-DIST mutt-gentoo-2.2.2-patches-r0.tar.xz 23160 BLAKE2B 2bc09d2aa67102b382c2466773868ba32f38827e44efc7ee2461fa592607a926547013f6c232ac2d6d0cd7dc07da386a0995c7819273b4c96c28a1a6140248a4 SHA512 3b45957d92a9d3f2c185965d226c137dcbb11eb58e497a4dc5ab49041eba79c7436b8239ceb625e32ef0453b7909d925a6238ec75dfa3f267eea46e86474758a
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
diff --git a/mail-client/mutt/mutt-2.0.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
deleted file mode 100644
index 0c29057fb2b1..000000000000
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2021 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 +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="
- 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? ( >=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_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}"
- "--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
-}
diff --git a/mail-client/mutt/mutt-2.2.2.ebuild b/mail-client/mutt/mutt-2.2.2.ebuild
deleted file mode 100644
index 9217536891d9..000000000000
--- a/mail-client/mutt/mutt-2.2.2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-04-28 22:56 Yixun Lan
0 siblings, 0 replies; 249+ messages in thread
From: Yixun Lan @ 2022-04-28 22:56 UTC (permalink / raw
To: gentoo-commits
commit: bc89ee0227b1968d4d10a93743b4fe6a11101673
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 22:55:57 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 22:55:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc89ee02
mail-client/mutt: Keyword 2.2.3 riscv, #841365
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
mail-client/mutt/mutt-2.2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
index 95c8d5c0d5c1..49f24a28652d 100644
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ b/mail-client/mutt/mutt-2.2.3.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-05-03 14:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-05-03 14:05 UTC (permalink / raw
To: gentoo-commits
commit: d4b20fb45a00c02ac15752d503537a5aa3457a84
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 14:05:21 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 3 14:05:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b20fb4
mail-client/mutt-2.2.4: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.2.4.ebuild | 268 +++++++++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 72e1fa7afd72..43fad0c39cf7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
+DIST mutt-2.2.4.tar.gz 5515825 BLAKE2B cae02e409d6d4d7c1e6544c1f9c5051b85d390258e6de0d98edcb9d3e519cecdfa1aa54d43cdae9d5ce8409d39752cac501e5433a21cc46bdf861a05f4059e37 SHA512 4a4b27069ab55ac557613659c210edc98016c8506e2281aa0cf1966fc18d04bb2e8d8f227c2a05b3e3657138c1ac9097f38e4693d49e42425b43ab63dd262b10
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
+DIST mutt-gentoo-2.2.4-patches-r0.tar.xz 23164 BLAKE2B 0645fa2d0a931fd9127de47ae5916fecf09cacbacdc8c6b5f3cea6e6df1c36ec33450c00f9f5261f8adf7dd2fce7e6842b0dd8f3f3ac73b5a0aaa64e774460ff SHA512 f64f8129b9cf9ab9c63bb3789090ba9a821af0411f9b4f858a4a1a95d52ec282581d4f3dd221fc83d715369e35b6a5c4e244f4ec2e5edda4d4ea432f4722f69b
diff --git a/mail-client/mutt/mutt-2.2.4.ebuild b/mail-client/mutt/mutt-2.2.4.ebuild
new file mode 100644
index 000000000000..5746fe1ea28f
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.4.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 ~riscv ~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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-05-25 11:56 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-05-25 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 5e2a1daa3dfbecda1de30404aac18417b36fe887
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 11:56:06 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed May 25 11:56:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e2a1daa
mail-client/mutt-2.2.5: version bump
Closes: https://bugs.gentoo.org/846767
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.2.5.ebuild | 268 +++++++++++++++++++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 43fad0c39cf7..6a809cab3471 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,4 +1,6 @@
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
DIST mutt-2.2.4.tar.gz 5515825 BLAKE2B cae02e409d6d4d7c1e6544c1f9c5051b85d390258e6de0d98edcb9d3e519cecdfa1aa54d43cdae9d5ce8409d39752cac501e5433a21cc46bdf861a05f4059e37 SHA512 4a4b27069ab55ac557613659c210edc98016c8506e2281aa0cf1966fc18d04bb2e8d8f227c2a05b3e3657138c1ac9097f38e4693d49e42425b43ab63dd262b10
+DIST mutt-2.2.5.tar.gz 5516189 BLAKE2B 1d89d2ab5c10cd7105695746e0073939936eda9ede9252ea816753d44fc86c0deef7999a59bdb98ab0ca710e0288149e91473acc7f0dd3a30260f39b455a1c00 SHA512 30b53e7d64c84dcd32e5aa20aa25ff439f11531ddb1278ddb603c3cd4543fad2a6c8eda6b43827557f265e22fb8fea75900e9e2d39d35201e66738303adcc226
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
DIST mutt-gentoo-2.2.4-patches-r0.tar.xz 23164 BLAKE2B 0645fa2d0a931fd9127de47ae5916fecf09cacbacdc8c6b5f3cea6e6df1c36ec33450c00f9f5261f8adf7dd2fce7e6842b0dd8f3f3ac73b5a0aaa64e774460ff SHA512 f64f8129b9cf9ab9c63bb3789090ba9a821af0411f9b4f858a4a1a95d52ec282581d4f3dd221fc83d715369e35b6a5c4e244f4ec2e5edda4d4ea432f4722f69b
+DIST mutt-gentoo-2.2.5-patches-r0.tar.xz 23124 BLAKE2B 1e2a32202a7a863c6e82b780716cee3701acd634327eec182d06360f793a32380772bb1e6501125f4058a8a4cbd7200f568750b5709c05d46a8b0760608645fd SHA512 e83d5c22cef6c5adda3733f8cd45d8fbfc6b19e570a14841809692e5d1f6ebfe3f8b45b8f10196685c5285ea8be18816caee81af58bb234e603785739ecd02a7
diff --git a/mail-client/mutt/mutt-2.2.5.ebuild b/mail-client/mutt/mutt-2.2.5.ebuild
new file mode 100644
index 000000000000..5746fe1ea28f
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.5.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 ~riscv ~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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-06-06 11:43 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-06-06 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 440d8fe07256f0a479ad9f257f12b7b8471d0eb0
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 11:43:00 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 11:43:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440d8fe0
mail-client/mutt-2.2.6: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.4.ebuild => mutt-2.2.6.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6a809cab3471..88f7b14535ed 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-2.2.4.tar.gz 5515825 BLAKE2B cae02e409d6d4d7c1e6544c1f9c5051b85d390258e6de0d98edcb9d3e519cecdfa1aa54d43cdae9d5ce8409d39752cac501e5433a21cc46bdf861a05f4059e37 SHA512 4a4b27069ab55ac557613659c210edc98016c8506e2281aa0cf1966fc18d04bb2e8d8f227c2a05b3e3657138c1ac9097f38e4693d49e42425b43ab63dd262b10
DIST mutt-2.2.5.tar.gz 5516189 BLAKE2B 1d89d2ab5c10cd7105695746e0073939936eda9ede9252ea816753d44fc86c0deef7999a59bdb98ab0ca710e0288149e91473acc7f0dd3a30260f39b455a1c00 SHA512 30b53e7d64c84dcd32e5aa20aa25ff439f11531ddb1278ddb603c3cd4543fad2a6c8eda6b43827557f265e22fb8fea75900e9e2d39d35201e66738303adcc226
+DIST mutt-2.2.6.tar.gz 5517121 BLAKE2B 07d598e134d35f4a849d95afcd5428689a0aa12797fa5ce08dfa3e8f7929f993c33a813862ceaff59d0c85a4dc28c00612817cc912c27ff94af304ad62ca7fa5 SHA512 07d473b6e6774f3988538e799fcc73ad35efceb5b1a3ee377754332f34db664d40ffa650711c7720ddc5c248e5379bba19fc5fd3dc7418a25305780e25f3b52b
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
-DIST mutt-gentoo-2.2.4-patches-r0.tar.xz 23164 BLAKE2B 0645fa2d0a931fd9127de47ae5916fecf09cacbacdc8c6b5f3cea6e6df1c36ec33450c00f9f5261f8adf7dd2fce7e6842b0dd8f3f3ac73b5a0aaa64e774460ff SHA512 f64f8129b9cf9ab9c63bb3789090ba9a821af0411f9b4f858a4a1a95d52ec282581d4f3dd221fc83d715369e35b6a5c4e244f4ec2e5edda4d4ea432f4722f69b
DIST mutt-gentoo-2.2.5-patches-r0.tar.xz 23124 BLAKE2B 1e2a32202a7a863c6e82b780716cee3701acd634327eec182d06360f793a32380772bb1e6501125f4058a8a4cbd7200f568750b5709c05d46a8b0760608645fd SHA512 e83d5c22cef6c5adda3733f8cd45d8fbfc6b19e570a14841809692e5d1f6ebfe3f8b45b8f10196685c5285ea8be18816caee81af58bb234e603785739ecd02a7
+DIST mutt-gentoo-2.2.6-patches-r0.tar.xz 23160 BLAKE2B fe681ddd227409ddd791abcf1bbd0691c6ab59fbd3e3fd004d4911e4ab7731c9a49e33ca836bc11f30099aaae08ffafb46faed6b05c51f424f2d9dee808f9649 SHA512 7e95342305efd1e55cf346976ac5ea3b88401a6e4ed75adb6970ece08a30e51e9358d450677deb3e3a609c7c878d6a6896730e40648557b2a9858aef88156c3c
diff --git a/mail-client/mutt/mutt-2.2.4.ebuild b/mail-client/mutt/mutt-2.2.6.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.2.4.ebuild
rename to mail-client/mutt/mutt-2.2.6.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-08-09 19:05 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-08-09 19:05 UTC (permalink / raw
To: gentoo-commits
commit: aca175d1a6a071f662bcf65c7dd49876bd129acb
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 9 19:04:50 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug 9 19:05:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca175d1
mail-client/mutt-2.2.7: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.5.ebuild => mutt-2.2.7.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 88f7b14535ed..014250a3afc7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-2.2.5.tar.gz 5516189 BLAKE2B 1d89d2ab5c10cd7105695746e0073939936eda9ede9252ea816753d44fc86c0deef7999a59bdb98ab0ca710e0288149e91473acc7f0dd3a30260f39b455a1c00 SHA512 30b53e7d64c84dcd32e5aa20aa25ff439f11531ddb1278ddb603c3cd4543fad2a6c8eda6b43827557f265e22fb8fea75900e9e2d39d35201e66738303adcc226
DIST mutt-2.2.6.tar.gz 5517121 BLAKE2B 07d598e134d35f4a849d95afcd5428689a0aa12797fa5ce08dfa3e8f7929f993c33a813862ceaff59d0c85a4dc28c00612817cc912c27ff94af304ad62ca7fa5 SHA512 07d473b6e6774f3988538e799fcc73ad35efceb5b1a3ee377754332f34db664d40ffa650711c7720ddc5c248e5379bba19fc5fd3dc7418a25305780e25f3b52b
+DIST mutt-2.2.7.tar.gz 5522342 BLAKE2B 3cc02ec5bc46f6a3f34c87c1454bdb0198be75a5669896b72ccd780b582cb1e7a4de466c41d25d1e74ab34e177bdca8c05574eddc6302e05acb8e3be6f53438e SHA512 5bc88d3efe82db50c2756e7011831caf907adf794e4d693d1318d25deeabac6834989ddef074064252f0f1f0e7df30d6d7d895e0a1d7893696e1f5252955ba22
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
-DIST mutt-gentoo-2.2.5-patches-r0.tar.xz 23124 BLAKE2B 1e2a32202a7a863c6e82b780716cee3701acd634327eec182d06360f793a32380772bb1e6501125f4058a8a4cbd7200f568750b5709c05d46a8b0760608645fd SHA512 e83d5c22cef6c5adda3733f8cd45d8fbfc6b19e570a14841809692e5d1f6ebfe3f8b45b8f10196685c5285ea8be18816caee81af58bb234e603785739ecd02a7
DIST mutt-gentoo-2.2.6-patches-r0.tar.xz 23160 BLAKE2B fe681ddd227409ddd791abcf1bbd0691c6ab59fbd3e3fd004d4911e4ab7731c9a49e33ca836bc11f30099aaae08ffafb46faed6b05c51f424f2d9dee808f9649 SHA512 7e95342305efd1e55cf346976ac5ea3b88401a6e4ed75adb6970ece08a30e51e9358d450677deb3e3a609c7c878d6a6896730e40648557b2a9858aef88156c3c
+DIST mutt-gentoo-2.2.7-patches-r0.tar.xz 23180 BLAKE2B 227c160387354ec5881e9e944ef76815c8466f11bc0717b2ed7b291392ad49faa8d2c3d9a6e01ccb63d2351f216c0975246b643925d97bff64abe056380b0911 SHA512 0fd9797329a31485e37bdfa76af253305198314749b6336d239ed43edbb839f189b4f0a2cbf982c2483ebb4d45118891339e16d4bd4cef18a3d5f2f7205682df
diff --git a/mail-client/mutt/mutt-2.2.5.ebuild b/mail-client/mutt/mutt-2.2.7.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.2.5.ebuild
rename to mail-client/mutt/mutt-2.2.7.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-11-06 11:53 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-11-06 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 59beab72cc84d72855ab632fc20803a1073fab5e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 11:53:29 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 11:53:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59beab72
mail-client/mutt-2.2.8: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.6.ebuild => mutt-2.2.8.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 014250a3afc7..e5a3425e6365 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-2.2.6.tar.gz 5517121 BLAKE2B 07d598e134d35f4a849d95afcd5428689a0aa12797fa5ce08dfa3e8f7929f993c33a813862ceaff59d0c85a4dc28c00612817cc912c27ff94af304ad62ca7fa5 SHA512 07d473b6e6774f3988538e799fcc73ad35efceb5b1a3ee377754332f34db664d40ffa650711c7720ddc5c248e5379bba19fc5fd3dc7418a25305780e25f3b52b
DIST mutt-2.2.7.tar.gz 5522342 BLAKE2B 3cc02ec5bc46f6a3f34c87c1454bdb0198be75a5669896b72ccd780b582cb1e7a4de466c41d25d1e74ab34e177bdca8c05574eddc6302e05acb8e3be6f53438e SHA512 5bc88d3efe82db50c2756e7011831caf907adf794e4d693d1318d25deeabac6834989ddef074064252f0f1f0e7df30d6d7d895e0a1d7893696e1f5252955ba22
+DIST mutt-2.2.8.tar.gz 5527187 BLAKE2B cdbb2ba8971a6f9cf6f5ee8f1e666e835d1716957d001561c67fab6381041ce5f8c994dad6e2d83f76e47f1ea12033d55b2c5f61348369c740f224d80405c0e1 SHA512 7723dffd5fb0f6f1aa1ab22e90f101d0d8b9cd4f198a3ac7ebbba7a3c00e0f2163ce03075f48a6f288a81bf621204c8d8eb247a3fb216a5f7d37686b0e8b9fb2
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
-DIST mutt-gentoo-2.2.6-patches-r0.tar.xz 23160 BLAKE2B fe681ddd227409ddd791abcf1bbd0691c6ab59fbd3e3fd004d4911e4ab7731c9a49e33ca836bc11f30099aaae08ffafb46faed6b05c51f424f2d9dee808f9649 SHA512 7e95342305efd1e55cf346976ac5ea3b88401a6e4ed75adb6970ece08a30e51e9358d450677deb3e3a609c7c878d6a6896730e40648557b2a9858aef88156c3c
DIST mutt-gentoo-2.2.7-patches-r0.tar.xz 23180 BLAKE2B 227c160387354ec5881e9e944ef76815c8466f11bc0717b2ed7b291392ad49faa8d2c3d9a6e01ccb63d2351f216c0975246b643925d97bff64abe056380b0911 SHA512 0fd9797329a31485e37bdfa76af253305198314749b6336d239ed43edbb839f189b4f0a2cbf982c2483ebb4d45118891339e16d4bd4cef18a3d5f2f7205682df
+DIST mutt-gentoo-2.2.8-patches-r0.tar.xz 23192 BLAKE2B f5e3baf4ae5fe54afc30f6449581646120b92cdaff6bdffbe936c65072b4dc013520fbc864d05fceefc0e3e2c6be34b01bca7aa3bdc933f14c8048d3aa886cb6 SHA512 82b31fed5e55f58a8cfa5f02b0c9ee170d66d2bfb09c0f59763c3070fd2358c265a4a0ede3b552c91f4e13c7ab7d87eadec9d2f245943a629361d8b98d8c1cbd
diff --git a/mail-client/mutt/mutt-2.2.6.ebuild b/mail-client/mutt/mutt-2.2.8.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-2.2.6.ebuild
rename to mail-client/mutt/mutt-2.2.8.ebuild
index 5746fe1ea28f..06bb916b3761 100644
--- a/mail-client/mutt/mutt-2.2.6.ebuild
+++ b/mail-client/mutt/mutt-2.2.8.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit flag-o-matic autotools
+inherit autotools
PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-11-06 19:46 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-11-06 19:46 UTC (permalink / raw
To: gentoo-commits
commit: dc2cc4dce10d100fd26137232983645097008367
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 19:43:47 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 19:46:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2cc4dc
mail-client/mutt-2.2.8: drop userpatches, avoid command not found
- eapply_user doesn't have a return-code that indicates user patches
were applied, so don't falsely report we did
- drop usage of commands that we don't have installed to avoid
false-positives #864753
Closes: https://bugs.gentoo.org/864753
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/mutt-2.2.8.ebuild | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/mutt-2.2.8.ebuild b/mail-client/mutt/mutt-2.2.8.ebuild
index 06bb916b3761..2f770033de52 100644
--- a/mail-client/mutt/mutt-2.2.8.ebuild
+++ b/mail-client/mutt/mutt-2.2.8.ebuild
@@ -99,16 +99,27 @@ src_prepare() {
main.c || die "Failed to add bug instructions"
fi
- local upatches=
# allow user patches
- eapply_user && upatches=" with 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}${upatches}"')"|' \
+ 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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2022-11-19 7:48 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2022-11-19 7:48 UTC (permalink / raw
To: gentoo-commits
commit: 4fe0de53ba3e09ea37383b0a6fe665eca10fa106
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 07:48:01 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 07:48:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe0de53
mail-client/mutt-2.2.9: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
.../mutt/{mutt-2.2.7.ebuild => mutt-2.2.9.ebuild} | 19 +++++++++++++++----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index e5a3425e6365..fcaeb9131167 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-2.2.7.tar.gz 5522342 BLAKE2B 3cc02ec5bc46f6a3f34c87c1454bdb0198be75a5669896b72ccd780b582cb1e7a4de466c41d25d1e74ab34e177bdca8c05574eddc6302e05acb8e3be6f53438e SHA512 5bc88d3efe82db50c2756e7011831caf907adf794e4d693d1318d25deeabac6834989ddef074064252f0f1f0e7df30d6d7d895e0a1d7893696e1f5252955ba22
DIST mutt-2.2.8.tar.gz 5527187 BLAKE2B cdbb2ba8971a6f9cf6f5ee8f1e666e835d1716957d001561c67fab6381041ce5f8c994dad6e2d83f76e47f1ea12033d55b2c5f61348369c740f224d80405c0e1 SHA512 7723dffd5fb0f6f1aa1ab22e90f101d0d8b9cd4f198a3ac7ebbba7a3c00e0f2163ce03075f48a6f288a81bf621204c8d8eb247a3fb216a5f7d37686b0e8b9fb2
+DIST mutt-2.2.9.tar.gz 5526236 BLAKE2B 86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74 SHA512 d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
-DIST mutt-gentoo-2.2.7-patches-r0.tar.xz 23180 BLAKE2B 227c160387354ec5881e9e944ef76815c8466f11bc0717b2ed7b291392ad49faa8d2c3d9a6e01ccb63d2351f216c0975246b643925d97bff64abe056380b0911 SHA512 0fd9797329a31485e37bdfa76af253305198314749b6336d239ed43edbb839f189b4f0a2cbf982c2483ebb4d45118891339e16d4bd4cef18a3d5f2f7205682df
DIST mutt-gentoo-2.2.8-patches-r0.tar.xz 23192 BLAKE2B f5e3baf4ae5fe54afc30f6449581646120b92cdaff6bdffbe936c65072b4dc013520fbc864d05fceefc0e3e2c6be34b01bca7aa3bdc933f14c8048d3aa886cb6 SHA512 82b31fed5e55f58a8cfa5f02b0c9ee170d66d2bfb09c0f59763c3070fd2358c265a4a0ede3b552c91f4e13c7ab7d87eadec9d2f245943a629361d8b98d8c1cbd
+DIST mutt-gentoo-2.2.9-patches-r0.tar.xz 23152 BLAKE2B 7cf64577ba36bd021238a0b09b7dc8ba7b8430215b7e15baab2c078740af135025a34b259ac05da59261c49ba73d29fb884d6e89cebf30499e40c00523693d08 SHA512 3bd74829b2cef73d0341c70a4d26feffee39ae7737c75322469921c0f97a7ecdccf627c6cee7f3c6e5ccd412ebf973a3f61f0156967cbd2ddd5b9e302d47d8dd
diff --git a/mail-client/mutt/mutt-2.2.7.ebuild b/mail-client/mutt/mutt-2.2.9.ebuild
similarity index 94%
rename from mail-client/mutt/mutt-2.2.7.ebuild
rename to mail-client/mutt/mutt-2.2.9.ebuild
index 5746fe1ea28f..2f770033de52 100644
--- a/mail-client/mutt/mutt-2.2.7.ebuild
+++ b/mail-client/mutt/mutt-2.2.9.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit flag-o-matic autotools
+inherit autotools
PATCHREV="r0"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
@@ -99,16 +99,27 @@ src_prepare() {
main.c || die "Failed to add bug instructions"
fi
- local upatches=
# allow user patches
- eapply_user && upatches=" with 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}${upatches}"')"|' \
+ 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
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-03-26 11:18 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2023-03-26 11:18 UTC (permalink / raw
To: gentoo-commits
commit: db925dbfce347c6aac985f5725bff332012255e9
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 11:18:12 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 11:18:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db925dbf
mail-client/mutt-2.2.10: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.8.ebuild => mutt-2.2.10.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index fcaeb9131167..1008a8f2fa85 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
+DIST mutt-2.2.10.tar.gz 5530411 BLAKE2B d6892f49520b4fd73d7d0d04119b4f05828d76a4be4b55a8dbc585ef817d4455c9b9a93158d31e0699f011023de524355930d4acff3b9454982da0042c54db22 SHA512 6db0009163b31425dafe7b6e38374a623f1fd057daf57baaebe18be6d42e5a0ce7087a41bc5e2411f4fbe144497a43682c480754b51108952c7dd16b9294192f
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-2.2.8.tar.gz 5527187 BLAKE2B cdbb2ba8971a6f9cf6f5ee8f1e666e835d1716957d001561c67fab6381041ce5f8c994dad6e2d83f76e47f1ea12033d55b2c5f61348369c740f224d80405c0e1 SHA512 7723dffd5fb0f6f1aa1ab22e90f101d0d8b9cd4f198a3ac7ebbba7a3c00e0f2163ce03075f48a6f288a81bf621204c8d8eb247a3fb216a5f7d37686b0e8b9fb2
DIST mutt-2.2.9.tar.gz 5526236 BLAKE2B 86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74 SHA512 d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f
+DIST mutt-gentoo-2.2.10-patches-r0.tar.xz 23192 BLAKE2B edf2f587ce3442f7e6d28fec96bc22effc39e68722d32fabfbe92ff5ce5bbe91256931c39ff7ab6c0638175302ecc4a2fc91a84ad2018831b97317a10aac7e98 SHA512 0f25f7bde16d6ed30e3b1e31a9ab1837f839d52b46f99558fa3942ddc880bc2eefb2328cc2c982332af956dc5998b9144a148a07bb90b8e447436fcd969c6258
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
-DIST mutt-gentoo-2.2.8-patches-r0.tar.xz 23192 BLAKE2B f5e3baf4ae5fe54afc30f6449581646120b92cdaff6bdffbe936c65072b4dc013520fbc864d05fceefc0e3e2c6be34b01bca7aa3bdc933f14c8048d3aa886cb6 SHA512 82b31fed5e55f58a8cfa5f02b0c9ee170d66d2bfb09c0f59763c3070fd2358c265a4a0ede3b552c91f4e13c7ab7d87eadec9d2f245943a629361d8b98d8c1cbd
DIST mutt-gentoo-2.2.9-patches-r0.tar.xz 23152 BLAKE2B 7cf64577ba36bd021238a0b09b7dc8ba7b8430215b7e15baab2c078740af135025a34b259ac05da59261c49ba73d29fb884d6e89cebf30499e40c00523693d08 SHA512 3bd74829b2cef73d0341c70a4d26feffee39ae7737c75322469921c0f97a7ecdccf627c6cee7f3c6e5ccd412ebf973a3f61f0156967cbd2ddd5b9e302d47d8dd
diff --git a/mail-client/mutt/mutt-2.2.8.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
similarity index 100%
rename from mail-client/mutt/mutt-2.2.8.ebuild
rename to mail-client/mutt/mutt-2.2.10.ebuild
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-04-25 9:37 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2023-04-25 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 9fae41ff9498c1abc6b4fc69202d64e924cef57b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 09:37:15 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 09:37:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fae41ff
mail-client/mutt: Stabilize 2.2.10 ppc64, #905002
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
index 2f770033de52..f515feb87f54 100644
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ b/mail-client/mutt/mutt-2.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-04-25 11:36 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2023-04-25 11:36 UTC (permalink / raw
To: gentoo-commits
commit: 88e9fc2df381893e3aa97b6a2bf526fd322ca3c4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 11:24:00 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 11:36:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e9fc2d
mail-client/mutt: Stabilize 2.2.10 amd64, #905002
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
index f515feb87f54..2df4bef436c5 100644
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ b/mail-client/mutt/mutt-2.2.10.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-04-25 11:36 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2023-04-25 11:36 UTC (permalink / raw
To: gentoo-commits
commit: dc2f196477eaa53a83568852a2d707297f486e40
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 11:24:00 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 11:36:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2f1964
mail-client/mutt: Stabilize 2.2.10 x86, #905002
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
index 2df4bef436c5..52511efdd711 100644
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ b/mail-client/mutt/mutt-2.2.10.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-04-25 11:55 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2023-04-25 11:55 UTC (permalink / raw
To: gentoo-commits
commit: c246b09ef4e5c8d1b3ba1ea6039be6c4700c5c87
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 11:54:57 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 11:55:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c246b09e
mail-client/mutt: Stabilize 2.2.10 arm, #905002
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
index 52511efdd711..7fd43dbc657d 100644
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ b/mail-client/mutt/mutt-2.2.10.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-04-25 11:56 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2023-04-25 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 358af2f36311bdfacb58f69b3fea5f3fd28fc5c9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 11:56:10 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 11:56:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358af2f3
mail-client/mutt: Stabilize 2.2.10 sparc, #905002
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
index 7fd43dbc657d..78557fdfff01 100644
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ b/mail-client/mutt/mutt-2.2.10.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv 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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-08-04 21:07 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2023-08-04 21:07 UTC (permalink / raw
To: gentoo-commits
commit: c8c01f2939d959be7bef9e71b9396deacd5f8477
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 4 21:07:35 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 4 21:07:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c01f29
mail-client/mutt: Stabilize 2.2.10 ppc, #905002
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
index 739656517029..5e76cc86ed64 100644
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ b/mail-client/mutt/mutt-2.2.10.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-08-19 16:03 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2023-08-19 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 6ef498a1962dfcf92fd32aeffde2403790ce6b53
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 16:02:58 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 16:03:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef498a1
mail-client/mutt-2.2.11: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.9.ebuild => mutt-2.2.11.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1008a8f2fa85..ce59512c935b 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.2.10.tar.gz 5530411 BLAKE2B d6892f49520b4fd73d7d0d04119b4f05828d76a4be4b55a8dbc585ef817d4455c9b9a93158d31e0699f011023de524355930d4acff3b9454982da0042c54db22 SHA512 6db0009163b31425dafe7b6e38374a623f1fd057daf57baaebe18be6d42e5a0ce7087a41bc5e2411f4fbe144497a43682c480754b51108952c7dd16b9294192f
+DIST mutt-2.2.11.tar.gz 5538204 BLAKE2B 3231986b17fab13aa70fec26fd43cbb8f692e0eeec78c1430156f05c1a9ee7f8d505708aafe30e61ea5a996d6b6fcad569695c6565bc98ca264fd0272ac88b84 SHA512 5372816b281b4805e19a134c08028bae0420c7417ef6e6b5c9ba6e49a79bf0bae7f97ffcc98486d558df0648750106a702c96cd01e0769983826e98a213a172a
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-2.2.9.tar.gz 5526236 BLAKE2B 86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74 SHA512 d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f
DIST mutt-gentoo-2.2.10-patches-r0.tar.xz 23192 BLAKE2B edf2f587ce3442f7e6d28fec96bc22effc39e68722d32fabfbe92ff5ce5bbe91256931c39ff7ab6c0638175302ecc4a2fc91a84ad2018831b97317a10aac7e98 SHA512 0f25f7bde16d6ed30e3b1e31a9ab1837f839d52b46f99558fa3942ddc880bc2eefb2328cc2c982332af956dc5998b9144a148a07bb90b8e447436fcd969c6258
+DIST mutt-gentoo-2.2.11-patches-r0.tar.xz 23176 BLAKE2B ebfd46dff5dd46a3630c9697741b519287f5053b01029eaf7993a496728acea4ff3d2771dcde7d4bbdc31e8630f51ca91ef12438e15dd5d3ced0a15d140c499a SHA512 fbbfe04325582fcb17284159e32ed9d00bfe9aaea2101bc1e86082e552e2a81972598e69e47e75d5127e94446bba5802f4e4a41868f2a9467a005af1ccab917b
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
-DIST mutt-gentoo-2.2.9-patches-r0.tar.xz 23152 BLAKE2B 7cf64577ba36bd021238a0b09b7dc8ba7b8430215b7e15baab2c078740af135025a34b259ac05da59261c49ba73d29fb884d6e89cebf30499e40c00523693d08 SHA512 3bd74829b2cef73d0341c70a4d26feffee39ae7737c75322469921c0f97a7ecdccf627c6cee7f3c6e5ccd412ebf973a3f61f0156967cbd2ddd5b9e302d47d8dd
diff --git a/mail-client/mutt/mutt-2.2.9.ebuild b/mail-client/mutt/mutt-2.2.11.ebuild
similarity index 98%
rename from mail-client/mutt/mutt-2.2.9.ebuild
rename to mail-client/mutt/mutt-2.2.11.ebuild
index 0c9fb3980886..ba9c06141bf1 100644
--- a/mail-client/mutt/mutt-2.2.9.ebuild
+++ b/mail-client/mutt/mutt-2.2.11.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-09-10 10:52 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2023-09-10 10:52 UTC (permalink / raw
To: gentoo-commits
commit: 88765052901b9bb0dcc97aacd542f29c50af1e26
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 10:52:21 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 10:52:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88765052
mail-client/mutt-2.2.12: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 ++--
mail-client/mutt/{mutt-2.2.11.ebuild => mutt-2.2.12.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index ce59512c935b..06a9ec6b297a 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,6 @@
DIST mutt-2.2.10.tar.gz 5530411 BLAKE2B d6892f49520b4fd73d7d0d04119b4f05828d76a4be4b55a8dbc585ef817d4455c9b9a93158d31e0699f011023de524355930d4acff3b9454982da0042c54db22 SHA512 6db0009163b31425dafe7b6e38374a623f1fd057daf57baaebe18be6d42e5a0ce7087a41bc5e2411f4fbe144497a43682c480754b51108952c7dd16b9294192f
-DIST mutt-2.2.11.tar.gz 5538204 BLAKE2B 3231986b17fab13aa70fec26fd43cbb8f692e0eeec78c1430156f05c1a9ee7f8d505708aafe30e61ea5a996d6b6fcad569695c6565bc98ca264fd0272ac88b84 SHA512 5372816b281b4805e19a134c08028bae0420c7417ef6e6b5c9ba6e49a79bf0bae7f97ffcc98486d558df0648750106a702c96cd01e0769983826e98a213a172a
+DIST mutt-2.2.12.tar.gz 5539244 BLAKE2B f17811a37804221fbb351083a25fa8b67511b7a11220e82ab6ce971fc9a0627ec9bcd8df6095e525dacda347aac51b9671cc8e6f8a3fdd8920b44fbcbc61189e SHA512 75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006
DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
DIST mutt-gentoo-2.2.10-patches-r0.tar.xz 23192 BLAKE2B edf2f587ce3442f7e6d28fec96bc22effc39e68722d32fabfbe92ff5ce5bbe91256931c39ff7ab6c0638175302ecc4a2fc91a84ad2018831b97317a10aac7e98 SHA512 0f25f7bde16d6ed30e3b1e31a9ab1837f839d52b46f99558fa3942ddc880bc2eefb2328cc2c982332af956dc5998b9144a148a07bb90b8e447436fcd969c6258
-DIST mutt-gentoo-2.2.11-patches-r0.tar.xz 23176 BLAKE2B ebfd46dff5dd46a3630c9697741b519287f5053b01029eaf7993a496728acea4ff3d2771dcde7d4bbdc31e8630f51ca91ef12438e15dd5d3ced0a15d140c499a SHA512 fbbfe04325582fcb17284159e32ed9d00bfe9aaea2101bc1e86082e552e2a81972598e69e47e75d5127e94446bba5802f4e4a41868f2a9467a005af1ccab917b
+DIST mutt-gentoo-2.2.12-patches-r0.tar.xz 22444 BLAKE2B 9c973cb0fe4705dda9e601d18b05d1385df6914af5928bfdba2ad196113a973dccac0f46373c3709654d1fc077aedd6e776c4c57803c095622a70807dafe2cc2 SHA512 3857d10055e98360d31d9ed2010e0d75db6fd0c0887e770f6b098869b25f72f5dc594a646b6fdf86cf6b24694e13965f82b8d8a4cb8b65a5e030f628a16b930d
DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
diff --git a/mail-client/mutt/mutt-2.2.11.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-2.2.11.ebuild
rename to mail-client/mutt/mutt-2.2.12.ebuild
index ba9c06141bf1..d6dbd8f2c7e7 100644
--- a/mail-client/mutt/mutt-2.2.11.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
nls? ( virtual/libintl )
sasl? (
- gsasl? ( virtual/gsasl )
+ gsasl? ( >=net-misc/gsasl-2.0.0 )
!gsasl? ( >=dev-libs/cyrus-sasl-2 )
)
kerberos? ( virtual/krb5 )
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-20 8:24 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2023-11-20 8:24 UTC (permalink / raw
To: gentoo-commits
commit: e2c844f23bdbbb9bf346c699c32e35f913b5d84f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 08:24:12 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 08:24:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c844f2
mail-client/mutt: Stabilize 2.2.12 ppc64, #917611
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index add2320907e5..a5ee8f629975 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-20 8:24 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2023-11-20 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 751f37c7cf1cb8bcad3cf8b0fec26ea02abdad58
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 08:24:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 08:24:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751f37c7
mail-client/mutt: Stabilize 2.2.12 sparc, #917611
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index 2309d526197b..add2320907e5 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-20 8:24 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2023-11-20 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 7c0b9d3f32359bf17e6f7cb083d0023bbe483402
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 08:24:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 08:24:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0b9d3f
mail-client/mutt: Stabilize 2.2.12 amd64, #917611
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index a5ee8f629975..b7ddd36ed75e 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-20 8:24 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2023-11-20 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 8f8242fc817275647a21f8f507efb1a7e228596a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 08:24:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 08:24:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8242fc
mail-client/mutt: Stabilize 2.2.12 x86, #917611
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index b7ddd36ed75e..9999368345a3 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-20 8:24 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2023-11-20 8:24 UTC (permalink / raw
To: gentoo-commits
commit: d87360de61c77c230f7346e555075febab8b00a7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 08:24:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 08:24:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87360de
mail-client/mutt: Stabilize 2.2.12 arm, #917611
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index d6dbd8f2c7e7..2309d526197b 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-22 11:16 Arthur Zamarin
0 siblings, 0 replies; 249+ messages in thread
From: Arthur Zamarin @ 2023-11-22 11:16 UTC (permalink / raw
To: gentoo-commits
commit: cbf890782c741185452ed03a87889130808e5fc4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 11:15:26 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:15:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf89078
mail-client/mutt: Stabilize 2.2.12 ppc, #917611
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index 9999368345a3..0180c39c8a2e 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2023-11-23 7:54 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2023-11-23 7:54 UTC (permalink / raw
To: gentoo-commits
commit: b447922cb1cf28436eeb6ecea10ac7d1ea08ba53
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 07:51:18 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 07:51:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b447922c
mail-client/mutt: cleanup old and vulnerable
Bug: https://bugs.gentoo.org/917610
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 4 -
mail-client/mutt/mutt-2.2.10.ebuild | 273 ------------------------------------
mail-client/mutt/mutt-2.2.3.ebuild | 262 ----------------------------------
3 files changed, 539 deletions(-)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 06a9ec6b297a..a416f9cf9c3d 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,6 +1,2 @@
-DIST mutt-2.2.10.tar.gz 5530411 BLAKE2B d6892f49520b4fd73d7d0d04119b4f05828d76a4be4b55a8dbc585ef817d4455c9b9a93158d31e0699f011023de524355930d4acff3b9454982da0042c54db22 SHA512 6db0009163b31425dafe7b6e38374a623f1fd057daf57baaebe18be6d42e5a0ce7087a41bc5e2411f4fbe144497a43682c480754b51108952c7dd16b9294192f
DIST mutt-2.2.12.tar.gz 5539244 BLAKE2B f17811a37804221fbb351083a25fa8b67511b7a11220e82ab6ce971fc9a0627ec9bcd8df6095e525dacda347aac51b9671cc8e6f8a3fdd8920b44fbcbc61189e SHA512 75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006
-DIST mutt-2.2.3.tar.gz 5509344 BLAKE2B 57d9d29d009e8dce6b27277aa4df371a4b03e783fb5482dc10db20ffa393db01b1aaeaee49bf8421b048e5bb07eeff31fcc1ef84db982b58c618d396ce11e56e SHA512 47656ee1b741d0d165fde4027fc7278910e39e9d5d0bfc5c52e7e767c3373bd3755833269d256364333fd4502c67490adcd5e4b33f1141f53ad575e9fb1a5131
-DIST mutt-gentoo-2.2.10-patches-r0.tar.xz 23192 BLAKE2B edf2f587ce3442f7e6d28fec96bc22effc39e68722d32fabfbe92ff5ce5bbe91256931c39ff7ab6c0638175302ecc4a2fc91a84ad2018831b97317a10aac7e98 SHA512 0f25f7bde16d6ed30e3b1e31a9ab1837f839d52b46f99558fa3942ddc880bc2eefb2328cc2c982332af956dc5998b9144a148a07bb90b8e447436fcd969c6258
DIST mutt-gentoo-2.2.12-patches-r0.tar.xz 22444 BLAKE2B 9c973cb0fe4705dda9e601d18b05d1385df6914af5928bfdba2ad196113a973dccac0f46373c3709654d1fc077aedd6e776c4c57803c095622a70807dafe2cc2 SHA512 3857d10055e98360d31d9ed2010e0d75db6fd0c0887e770f6b098869b25f72f5dc594a646b6fdf86cf6b24694e13965f82b8d8a4cb8b65a5e030f628a16b930d
-DIST mutt-gentoo-2.2.3-patches-r0.tar.xz 23168 BLAKE2B be7fad2f06b913439df4fb7a223e7305b66195153329956f4be9fdd524ac0de6121ccf9a6dc506b0b68e12759667173379c4e0ff1645c1b9948aaed1f7601033 SHA512 22edcc53a42133093eb163e4cfba2e865aec31ef87c74e35aaad10d9a4543f9d2cf477ac263da11e247eba300eb72a42870a59a8a3a90341691bdb0ee6d44d5f
diff --git a/mail-client/mutt/mutt-2.2.10.ebuild b/mail-client/mutt/mutt-2.2.10.ebuild
deleted file mode 100644
index 5e76cc86ed64..000000000000
--- a/mail-client/mutt/mutt-2.2.10.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2023 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="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 ~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? ( 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
-
- # 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.3.ebuild b/mail-client/mutt/mutt-2.2.3.ebuild
deleted file mode 100644
index 749342f6246c..000000000000
--- a/mail-client/mutt/mutt-2.2.3.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2023 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~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? ( 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"
- )
-
- # 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
-}
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2024-01-27 6:32 Sam James
0 siblings, 0 replies; 249+ messages in thread
From: Sam James @ 2024-01-27 6:32 UTC (permalink / raw
To: gentoo-commits
commit: 255832fb73933e9f19a061703e48af9e07f8400c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 06:32:00 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 06:32:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255832fb
mail-client/mutt: Stabilize 2.2.12 arm64, #922305
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/mutt/mutt-2.2.12.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt/mutt-2.2.12.ebuild b/mail-client/mutt/mutt-2.2.12.ebuild
index 0180c39c8a2e..a92f5a436505 100644
--- a/mail-client/mutt/mutt-2.2.12.ebuild
+++ b/mail-client/mutt/mutt-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -28,7 +28,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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="
^ permalink raw reply related [flat|nested] 249+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
@ 2024-03-22 9:01 Fabian Groffen
0 siblings, 0 replies; 249+ messages in thread
From: Fabian Groffen @ 2024-03-22 9:01 UTC (permalink / raw
To: gentoo-commits
commit: c2da1a289c0a8140e7a9c1af5d48d3a78d750cd6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 09:01:11 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 09:01:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2da1a28
mail-client/mutt-2.2.13: version bump
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.2.13.ebuild | 273 ++++++++++++++++++++++++++++++++++++
2 files changed, 275 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a416f9cf9c3d..842d5e6a712c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
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-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
diff --git a/mail-client/mutt/mutt-2.2.13.ebuild b/mail-client/mutt/mutt-2.2.13.ebuild
new file mode 100644
index 000000000000..2a8f7e468966
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.13.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2024 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="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 ~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
+}
^ permalink raw reply related [flat|nested] 249+ messages in thread
end of thread, other threads:[~2024-03-22 9:01 UTC | newest]
Thread overview: 249+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-06 10:04 [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-03-22 9:01 Fabian Groffen
2024-01-27 6:32 Sam James
2023-11-23 7:54 Fabian Groffen
2023-11-22 11:16 Arthur Zamarin
2023-11-20 8:24 Sam James
2023-11-20 8:24 Sam James
2023-11-20 8:24 Sam James
2023-11-20 8:24 Sam James
2023-11-20 8:24 Sam James
2023-09-10 10:52 Fabian Groffen
2023-08-19 16:03 Fabian Groffen
2023-08-04 21:07 Arthur Zamarin
2023-04-25 11:56 Arthur Zamarin
2023-04-25 11:55 Sam James
2023-04-25 11:36 Arthur Zamarin
2023-04-25 11:36 Arthur Zamarin
2023-04-25 9:37 Arthur Zamarin
2023-03-26 11:18 Fabian Groffen
2022-11-19 7:48 Fabian Groffen
2022-11-06 19:46 Fabian Groffen
2022-11-06 11:53 Fabian Groffen
2022-08-09 19:05 Fabian Groffen
2022-06-06 11:43 Fabian Groffen
2022-05-25 11:56 Fabian Groffen
2022-05-03 14:05 Fabian Groffen
2022-04-28 22:56 Yixun Lan
2022-04-27 15:49 Fabian Groffen
2022-04-27 4:34 Arthur Zamarin
2022-04-19 16:43 Arthur Zamarin
2022-04-19 13:46 Jakov Smolić
2022-04-19 13:35 Arthur Zamarin
2022-04-19 12:13 Arthur Zamarin
2022-04-19 8:53 Jakov Smolić
2022-04-15 6:59 Fabian Groffen
2022-03-28 10:03 Fabian Groffen
2022-02-20 8:29 Fabian Groffen
2022-02-13 9:51 Fabian Groffen
2021-12-31 9:57 Fabian Groffen
2021-12-13 7:03 Fabian Groffen
2021-09-23 6:03 Fabian Groffen
2021-08-26 5:14 Fabian Groffen
2021-07-13 17:02 Fabian Groffen
2021-06-13 10:31 Fabian Groffen
2021-05-07 13:42 Fabian Groffen
2021-05-07 13:33 Sam James
2021-05-06 21:22 Sam James
2021-05-06 21:20 Sam James
2021-05-06 15:30 Sergei Trofimovich
2021-05-06 10:06 Sam James
2021-05-04 20:08 Fabian Groffen
2021-04-30 23:27 Sam James
2021-04-29 18:00 Mikle Kolyada
2021-03-07 12:06 Fabian Groffen
2021-01-25 7:26 Fabian Groffen
2021-01-24 22:04 Sam James
2021-01-24 22:04 Sam James
2021-01-24 21:51 Sam James
2021-01-24 20:06 Sam James
2021-01-24 11:58 Agostino Sarubbo
2021-01-22 9:32 Fabian Groffen
2021-01-18 8:48 Fabian Groffen
2021-01-06 13:49 Fabian Groffen
2020-12-31 8:58 Fabian Groffen
2020-12-06 10:45 Fabian Groffen
2020-11-26 22:59 Sergei Trofimovich
2020-11-26 8:32 Sam James
2020-11-26 6:56 Agostino Sarubbo
2020-11-25 12:15 Agostino Sarubbo
2020-11-25 12:14 Agostino Sarubbo
2020-11-25 12:13 Agostino Sarubbo
2020-11-25 10:28 Thomas Deutschmann
2020-11-20 18:59 Fabian Groffen
2020-11-09 9:53 Fabian Groffen
2020-09-06 7:50 Fabian Groffen
2020-07-10 10:54 Sam James
2020-06-25 9:42 Fabian Groffen
2020-06-25 9:08 Fabian Groffen
2020-06-25 7:00 Agostino Sarubbo
2020-06-22 18:23 Sergei Trofimovich
2020-06-22 7:01 Agostino Sarubbo
2020-06-22 7:00 Agostino Sarubbo
2020-06-22 7:00 Agostino Sarubbo
2020-06-21 7:47 Fabian Groffen
2020-06-20 18:59 Sergei Trofimovich
2020-06-20 13:48 Thomas Deutschmann
2020-06-19 7:01 Fabian Groffen
2020-06-17 20:36 Sergei Trofimovich
2020-06-16 16:41 Sergei Trofimovich
2020-06-15 19:49 Fabian Groffen
2020-05-26 7:11 Fabian Groffen
2020-05-14 18:11 Fabian Groffen
2020-05-04 7:09 Fabian Groffen
2020-03-31 17:05 Fabian Groffen
2020-03-31 7:22 Agostino Sarubbo
2020-03-31 7:20 Agostino Sarubbo
2020-03-31 7:19 Agostino Sarubbo
2020-03-31 7:18 Agostino Sarubbo
2020-03-30 20:50 Sergei Trofimovich
2020-03-30 15:13 Agostino Sarubbo
2020-03-30 7:17 Fabian Groffen
2020-03-06 7:25 Fabian Groffen
2020-03-06 7:25 Fabian Groffen
2020-02-16 13:33 Fabian Groffen
2020-01-31 8:08 Michał Górny
2019-12-18 8:05 Fabian Groffen
2019-12-15 9:26 Fabian Groffen
2019-12-01 9:34 Fabian Groffen
2019-11-14 8:53 Fabian Groffen
2019-11-04 18:59 Fabian Groffen
2019-11-03 13:47 Fabian Groffen
2019-11-03 10:21 Fabian Groffen
2019-10-31 12:44 Fabian Groffen
2019-09-26 7:45 Fabian Groffen
2019-09-15 15:37 Fabian Groffen
2019-08-11 8:45 Michał Górny
2019-06-17 17:13 Fabian Groffen
2019-05-29 14:03 Fabian Groffen
2019-03-13 14:12 Fabian Groffen
2019-02-02 12:46 Fabian Groffen
2019-01-10 18:05 Fabian Groffen
2019-01-08 8:48 Fabian Groffen
2019-01-06 20:42 Fabian Groffen
2019-01-05 19:21 Fabian Groffen
2019-01-04 10:52 Sergei Trofimovich
2019-01-02 10:54 Fabian Groffen
2018-12-02 18:16 Fabian Groffen
2018-11-27 12:34 Fabian Groffen
2018-10-31 9:01 Fabian Groffen
2018-09-19 2:57 Fabian Groffen
2018-09-08 20:25 Sergei Trofimovich
2018-08-14 16:02 Alon Bar-Lev
2018-07-23 8:24 Tobias Klausmann
2018-07-22 19:41 Mikle Kolyada
2018-07-22 9:01 Sergei Trofimovich
2018-07-20 22:48 Sergei Trofimovich
2018-07-20 22:40 Thomas Deutschmann
2018-07-20 8:08 Sergei Trofimovich
2018-07-19 20:15 Sergei Trofimovich
2018-07-19 10:07 Agostino Sarubbo
2018-07-16 18:34 Fabian Groffen
2018-05-25 4:28 Matt Turner
2018-05-25 4:28 Matt Turner
2018-05-23 14:35 Fabian Groffen
2018-04-20 5:50 Mikle Kolyada
2018-04-18 7:05 Sergei Trofimovich
2018-04-16 20:25 Fabian Groffen
2018-04-12 19:07 Thomas Deutschmann
2018-04-08 8:53 Sergei Trofimovich
2018-04-08 7:37 Fabian Groffen
2018-04-06 17:13 Tobias Klausmann
2018-04-06 16:08 Aaron Bauman
2018-04-01 7:12 Fabian Groffen
2018-03-10 14:58 Fabian Groffen
2018-02-10 15:26 Fabian Groffen
2018-02-10 9:39 Fabian Groffen
2018-02-09 20:37 Fabian Groffen
2018-01-07 13:12 Fabian Groffen
2017-12-31 14:48 Fabian Groffen
2017-12-30 10:11 Fabian Groffen
2017-12-16 20:58 Fabian Groffen
2017-12-16 14:02 Fabian Groffen
2017-12-16 13:08 Fabian Groffen
2017-12-14 7:47 Fabian Groffen
2017-12-10 16:31 Fabian Groffen
2017-12-10 13:46 Nicolas Bock
2017-12-10 10:58 Fabian Groffen
2017-12-02 11:24 Fabian Groffen
2017-12-02 11:22 Fabian Groffen
2017-10-19 6:07 Fabian Groffen
2017-09-24 9:15 Fabian Groffen
2017-09-21 8:17 Fabian Groffen
2017-09-12 10:50 Fabian Groffen
2017-09-11 18:17 Fabian Groffen
2017-09-09 19:14 Fabian Groffen
2017-07-10 16:51 Fabian Groffen
2017-06-25 8:02 Sergei Trofimovich
2017-06-17 17:24 Agostino Sarubbo
2017-06-16 14:10 Agostino Sarubbo
2017-06-04 8:05 Fabian Groffen
2017-04-21 7:34 Fabian Groffen
2017-04-19 19:44 Fabian Groffen
2017-04-19 12:07 Fabian Groffen
2017-04-13 17:34 Fabian Groffen
2017-03-26 15:05 Fabian Groffen
2017-03-10 14:26 Michael Weber
2017-02-28 13:16 Fabian Groffen
2017-02-25 20:04 Fabian Groffen
2017-02-16 23:14 Michael Weber
2017-02-03 22:18 Jeroen Roovers
2017-02-03 20:19 Jeroen Roovers
2017-02-02 15:44 Fabian Groffen
2017-01-25 13:53 Fabian Groffen
2017-01-04 19:52 Fabian Groffen
2016-12-31 17:54 Mikle Kolyada
2016-12-21 21:34 Thomas Deutschmann
2016-12-11 12:50 Fabian Groffen
2016-12-07 18:57 Fabian Groffen
2016-12-07 18:51 Fabian Groffen
2016-12-07 6:42 Jason Zaman
2016-12-05 9:10 Fabian Groffen
2016-11-28 6:43 Fabian Groffen
2016-11-27 21:04 Fabian Groffen
2016-11-27 21:04 Fabian Groffen
2016-11-17 20:38 Fabian Groffen
2016-11-04 20:35 Fabian Groffen
2016-10-19 16:15 Fabian Groffen
2016-10-13 16:06 Fabian Groffen
2016-10-13 16:06 Fabian Groffen
2016-10-13 16:06 Fabian Groffen
2016-10-13 16:06 Fabian Groffen
2016-10-13 16:06 Fabian Groffen
2016-10-09 17:49 Fabian Groffen
2016-09-23 8:04 Fabian Groffen
2016-09-18 13:17 Fabian Groffen
2016-09-13 8:08 Fabian Groffen
2016-09-06 7:48 Fabian Groffen
2016-09-04 15:04 Fabian Groffen
2016-09-04 12:59 Fabian Groffen
2016-09-01 13:08 Fabian Groffen
2016-08-22 9:33 Fabian Groffen
2016-07-10 15:23 Fabian Groffen
2016-07-09 15:48 Fabian Groffen
2016-07-04 17:02 Tobias Klausmann
2016-06-30 7:15 Fabian Groffen
2016-06-28 17:18 Fabian Groffen
2016-06-16 12:20 Fabian Groffen
2016-06-13 8:25 Fabian Groffen
2016-06-13 8:21 Fabian Groffen
2016-06-11 13:15 Markus Meier
2016-05-15 10:15 Fabian Groffen
2016-05-02 9:30 Fabian Groffen
2016-04-18 7:23 Fabian Groffen
2016-04-17 20:15 Fabian Groffen
2016-04-12 18:57 Fabian Groffen
2016-04-12 18:57 Fabian Groffen
2016-04-05 15:52 Fabian Groffen
2016-04-04 14:15 Fabian Groffen
2016-02-03 14:47 Tobias Klausmann
2016-01-24 6:50 Jeroen Roovers
2016-01-20 14:12 Patrice Clement
2015-12-03 22:40 Michał Górny
2015-10-04 21:28 Julian Ospald
2015-09-06 15:50 Fabian Groffen
2015-09-05 8:15 Fabian Groffen
2015-09-02 19:44 Fabian Groffen
2015-08-25 18:32 Fabian Groffen
2015-08-24 17:25 Fabian Groffen
2015-08-23 7:20 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox