summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2016-09-04 14:59:19 +0200
committerFabian Groffen <grobian@gentoo.org>2016-09-04 14:59:19 +0200
commit560f2dea5014c6993982dc8f0ccd6977105e8434 (patch)
tree2f5dc6a682e74bdb74b13b28cf1881db44bdd7e3 /mail-client/mutt
parentsys-kernel/rt-sources: version bump to 4.6.7_p11. (diff)
downloadgentoo-560f2dea5014c6993982dc8f0ccd6977105e8434.tar.gz
gentoo-560f2dea5014c6993982dc8f0ccd6977105e8434.tar.bz2
gentoo-560f2dea5014c6993982dc8f0ccd6977105e8434.zip
mail-client/mutt: revbump for fixes for bugs #592664 and #592680
Package-Manager: portage-2.2.28
Diffstat (limited to 'mail-client/mutt')
-rw-r--r--mail-client/mutt/Manifest2
-rw-r--r--mail-client/mutt/mutt-1.7.0-r1.ebuild (renamed from mail-client/mutt/mutt-1.7.0.ebuild)7
2 files changed, 5 insertions, 4 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index db81b945f0d3..5cff255488a5 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
index ac0fa93c4836..85b30b75d814 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=