gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-07 05:57:07 -08:00
Code Issues Projects Releases Wiki Activity

mail-client/mutt: version bump to 1.9.2

Browse Source 
Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
This commit is contained in:
Fabian Groffen
2017-12-16 14:08:39 +01:00
parent f5909b607e
commit 91e4e4a2af
4 changed files with 68 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-client/mutt/Manifest
+2 -2
View File
@@ -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
mail-client/mutt/metadata.xml
+3
View File
@@ -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>
mail-client/mutt/mutt-1.9.1-r2.ebuild
-252
View File
@@ -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
}
mail-client/mutt/mutt-1.9.0-r2.ebuild → mail-client/mutt/mutt-1.9.2.ebuild
+63 -42
View File
@@ -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)"
# 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 !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
}