1 |
commit: 1ef9201cbd8a249088ad62b839dd86fff8692678 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 13 12:51:24 2019 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 13 14:11:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef9201c |
7 |
|
8 |
mail-client/mutt: version bump |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
mail-client/mutt/Manifest | 6 +- |
14 |
mail-client/mutt/mutt-1.11.2-r1.ebuild | 288 --------------------- |
15 |
.../{mutt-1.11.1-r2.ebuild => mutt-1.11.4.ebuild} | 2 +- |
16 |
3 files changed, 3 insertions(+), 293 deletions(-) |
17 |
|
18 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
19 |
index fcd5db38e41..a58b710e0ac 100644 |
20 |
--- a/mail-client/mutt/Manifest |
21 |
+++ b/mail-client/mutt/Manifest |
22 |
@@ -1,8 +1,6 @@ |
23 |
DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726 |
24 |
-DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0 |
25 |
-DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d |
26 |
DIST mutt-1.11.3.tar.gz 4581196 BLAKE2B 12f7a067bdfab72628e3fd25e9391d252c8665db845963df5c4a8f66f7d68ce1385e94fd35527718fdbedc9759910e2ee7253430ecddb8ea92f6368078be9a03 SHA512 381079254f01cdd85b9e556a10bb1ddf0b49d96b54fe21d70dd735199dcbbfd46956ad85201fe8a4e8cdf7bdb121664c7b4edc0659da6b14dc8eaf6adf9827df |
27 |
+DIST mutt-1.11.4.tar.gz 4582417 BLAKE2B 750385cc90df0d34d35103883a9918f205830ea93e5ec9f33cd579d5c121d630b3074f1918fa0e8e5aa91edd503c7ba38c34785a8a96803d7af30d08a0966c4d SHA512 18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb |
28 |
DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5 |
29 |
-DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148 |
30 |
-DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e |
31 |
DIST mutt-gentoo-1.11.3-patches-r0.tar.xz 107172 BLAKE2B bb82a95baf3fe5af191d5da7bd56d0f51d43a390be08442c945515330fd11d5d3a0c2893a5a595ea8a23421ec5ea79aa36a05e46ce71d449c28193b819154c9b SHA512 2d1579f03876398eb793548b31fe8bfc15d226651334dfe07a65eff45ab777eebaae66d85dd0a59e05649ae0924fdb45cfced438eb0dff9742bc13b1fb1ae671 |
32 |
+DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1 |
33 |
|
34 |
diff --git a/mail-client/mutt/mutt-1.11.2-r1.ebuild b/mail-client/mutt/mutt-1.11.2-r1.ebuild |
35 |
deleted file mode 100644 |
36 |
index a33f730ccdb..00000000000 |
37 |
--- a/mail-client/mutt/mutt-1.11.2-r1.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,288 +0,0 @@ |
40 |
-# Copyright 1999-2019 Gentoo Authors |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI="6" |
44 |
- |
45 |
-inherit eutils flag-o-matic autotools |
46 |
- |
47 |
-PATCHREV="r1" |
48 |
-PATCHSET="gentoo-${PVR}/${PATCHREV}" |
49 |
- |
50 |
-DESCRIPTION="A small but very powerful text-based mail client" |
51 |
-HOMEPAGE="http://www.mutt.org/" |
52 |
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" |
53 |
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
54 |
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
55 |
- https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
56 |
-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" |
57 |
-# hcache: allow multiple, bug #607360 |
58 |
-REQUIRED_USE=" |
59 |
- hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
60 |
- imap? ( ssl ) |
61 |
- pop? ( ssl ) |
62 |
- nntp? ( ssl ) |
63 |
- smime? ( ssl !gnutls ) |
64 |
- smime_classic? ( ssl !gnutls ) |
65 |
- smtp? ( ssl sasl ) |
66 |
- sasl? ( || ( imap pop smtp nntp ) ) |
67 |
- kerberos? ( || ( imap pop smtp nntp ) )" |
68 |
-SLOT="0" |
69 |
-LICENSE="GPL-2" |
70 |
-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" |
71 |
-# yes, we overdepend on the backend impls here, hopefully one day we can |
72 |
-# have REQUIRED_USE do what it is made for again. bug #607360 |
73 |
-CDEPEND=" |
74 |
- app-misc/mime-types |
75 |
- virtual/libiconv |
76 |
- |
77 |
- berkdb? ( >=sys-libs/db-4:= ) |
78 |
- gdbm? ( sys-libs/gdbm ) |
79 |
- lmdb? ( dev-db/lmdb:= ) |
80 |
- qdbm? ( dev-db/qdbm ) |
81 |
- tokyocabinet? ( dev-db/tokyocabinet ) |
82 |
- |
83 |
- ssl? ( |
84 |
- gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
85 |
- !gnutls? ( |
86 |
- libressl? ( dev-libs/libressl:= ) |
87 |
- !libressl? ( >=dev-libs/openssl-0.9.6:0= ) |
88 |
- ) |
89 |
- ) |
90 |
- |
91 |
- nls? ( virtual/libintl ) |
92 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
93 |
- kerberos? ( virtual/krb5 ) |
94 |
- idn? ( net-dns/libidn2 ) |
95 |
- gpg? ( >=app-crypt/gpgme-0.9.0:= ) |
96 |
- gpgme? ( >=app-crypt/gpgme-0.9.0:= ) |
97 |
- notmuch? ( net-mail/notmuch:= ) |
98 |
- slang? ( sys-libs/slang ) |
99 |
- !slang? ( >=sys-libs/ncurses-5.2:0= ) |
100 |
-" |
101 |
-DEPEND="${CDEPEND} |
102 |
- net-mail/mailbase |
103 |
- doc? ( |
104 |
- dev-libs/libxml2 |
105 |
- dev-libs/libxslt |
106 |
- app-text/docbook-xsl-stylesheets |
107 |
- || ( www-client/lynx www-client/w3m www-client/elinks ) |
108 |
- )" |
109 |
-RDEPEND="${CDEPEND} |
110 |
- selinux? ( sec-policy/selinux-mutt ) |
111 |
- smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) |
112 |
- smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) |
113 |
- crypt? ( app-crypt/gnupg ) |
114 |
- pgp_classic? ( app-crypt/gnupg ) |
115 |
-" |
116 |
- |
117 |
-src_prepare() { |
118 |
- local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV} |
119 |
- |
120 |
- if use !vanilla ; then |
121 |
- # apply patches |
122 |
- export EPATCH_FORCE="yes" |
123 |
- export EPATCH_SUFFIX="patch" |
124 |
- # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10 |
125 |
- local patches=( |
126 |
- patches-mutt |
127 |
- bugs-gentoo |
128 |
- features-common |
129 |
- features-extra |
130 |
- gentoo |
131 |
- ) |
132 |
- local patchset |
133 |
- for patchset in "${patches[@]}" ; do |
134 |
- [[ -d "${PATCHDIR}/${patchset}" ]] || continue |
135 |
- einfo "Patches for ${PATCHSET} patchset ${patchset}" |
136 |
- EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ |
137 |
- || die "patchset ${patchset} failed" |
138 |
- done |
139 |
- # add some explanation as to why not to go upstream |
140 |
- sed -i \ |
141 |
- -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\\' \ |
142 |
- main.c || die "Failed to add bug instructions" |
143 |
- fi |
144 |
- |
145 |
- local upatches= |
146 |
- # allow user patches |
147 |
- eapply_user && upatches=" with user patches" |
148 |
- |
149 |
- # patch version string for bug reports |
150 |
- local patchset= |
151 |
- use vanilla || patchset=", ${PATCHSET}" |
152 |
- sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ |
153 |
- muttlib.c || die "failed patching in Gentoo version" |
154 |
- |
155 |
- # many patches touch the buildsystem, we always need this |
156 |
- AT_M4DIR="m4" eautoreconf |
157 |
- |
158 |
- # the configure script contains some "cleverness" whether or not to setgid |
159 |
- # the dotlock program, resulting in bugs like #278332 |
160 |
- sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed" |
161 |
-} |
162 |
- |
163 |
-src_configure() { |
164 |
- local myconf=( |
165 |
- # signing and encryption |
166 |
- # clumpsy blocks for transition period of USE-flag renames |
167 |
- $(use crypt && use_enable crypt pgp) |
168 |
- $(use pgp_classic && use_enable pgp_classic pgp) |
169 |
- $(use !crypt && use !pgp_classic && echo "--disable-pgp") |
170 |
- |
171 |
- $(use smime && use_enable smime) |
172 |
- $(use smime_classic && use_enable smime_classic smime) |
173 |
- $(use !smime && use !smime_classic && echo "--disable-smime") |
174 |
- |
175 |
- $(use gpg && use_enable gpg gpgme) |
176 |
- $(use gpgme && use_enable gpgme) |
177 |
- $(use !gpg && use !gpgme && echo "--disable-gpgme") |
178 |
- |
179 |
- # features |
180 |
- $(use_enable debug) |
181 |
- $(use_enable doc) |
182 |
- $(use_enable nls) |
183 |
- $(use_enable notmuch) |
184 |
- |
185 |
- # protocols |
186 |
- $(use_enable imap) |
187 |
- $(use_enable pop) |
188 |
- $(use_enable nntp) |
189 |
- $(use_enable smtp) |
190 |
- |
191 |
- $(use ssl && use gnutls && echo --with-gnutls --without-ssl) |
192 |
- $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) |
193 |
- $(use !ssl && echo --without-gnutls --without-ssl) |
194 |
- |
195 |
- $(use_with sasl) |
196 |
- $(use_with idn idn2) --without-idn # avoid automagic libidn dep |
197 |
- $(use_with kerberos gss) |
198 |
- "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)" |
199 |
- "$(use_with !slang curses "${EPREFIX}"/usr)" |
200 |
- |
201 |
- "--enable-compressed" |
202 |
- "--enable-external-dotlock" |
203 |
- "--enable-iconv" |
204 |
- "--enable-nfs-fix" |
205 |
- "--enable-sidebar" |
206 |
- "--sysconfdir=${EPREFIX}/etc/${PN}" |
207 |
- "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
208 |
- "--with-regex" |
209 |
- "--with-exec-shell=${EPREFIX}/bin/sh" |
210 |
- ) |
211 |
- |
212 |
- if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then |
213 |
- # arrows in index view do not show when using wchar_t |
214 |
- # or misalign due to wrong computations |
215 |
- myconf+=( "--without-wc-funcs" ) |
216 |
- fi |
217 |
- |
218 |
- # note: REQUIRED_USE should have selected only one of these, but for |
219 |
- # bug #607360 we're forced to allow multiple. For that reason, this |
220 |
- # list is ordered to preference, and only the first is taken. |
221 |
- local hcaches=( |
222 |
- "lmdb" |
223 |
- "qdbm" |
224 |
- "tokyocabinet" |
225 |
- "gdbm" |
226 |
- "berkdb:bdb" |
227 |
- ) |
228 |
- local ucache hcache lcache |
229 |
- for hcache in "${hcaches[@]}" ; do |
230 |
- if use ${hcache%%:*} ; then |
231 |
- ucache=${hcache} |
232 |
- break |
233 |
- fi |
234 |
- done |
235 |
- if [[ -n ${ucache} ]] ; then |
236 |
- myconf+=( "--enable-hcache" ) |
237 |
- else |
238 |
- myconf+=( "--disable-hcache" ) |
239 |
- fi |
240 |
- for hcache in "${hcaches[@]}" ; do |
241 |
- [[ ${hcache} == ${ucache} ]] \ |
242 |
- && myconf+=( "--with-${hcache#*:}" ) \ |
243 |
- || myconf+=( "--without-${hcache#*:}" ) |
244 |
- done |
245 |
- |
246 |
- if use mbox; then |
247 |
- myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) |
248 |
- else |
249 |
- myconf+=( "--with-homespool=Maildir" ) |
250 |
- fi |
251 |
- |
252 |
- econf "${myconf[@]}" || die "configure failed" |
253 |
-} |
254 |
- |
255 |
-src_install() { |
256 |
- emake DESTDIR="${D}" install || die "install failed" |
257 |
- if use mbox; then |
258 |
- insinto /etc/mutt |
259 |
- newins "${FILESDIR}"/Muttrc.mbox Muttrc |
260 |
- else |
261 |
- insinto /etc/mutt |
262 |
- doins "${FILESDIR}"/Muttrc |
263 |
- fi |
264 |
- |
265 |
- # A newer file is provided by app-misc/mime-types. So we link it. |
266 |
- rm "${ED}"/etc/${PN}/mime.types |
267 |
- dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types |
268 |
- |
269 |
- # A man-page is always handy, so fake one |
270 |
- if use !doc; then |
271 |
- emake -C doc DESTDIR="${D}" muttrc.man || die |
272 |
- # make the fake slightly better, bug #413405 |
273 |
- sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ |
274 |
- -e 's#in @docdir@,#at http://www.mutt.org/,#' \ |
275 |
- -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \ |
276 |
- -e "s#@bindir@#${EPREFIX}/usr/bin#" \ |
277 |
- doc/mutt.man > mutt.1 || die |
278 |
- cp doc/muttrc.man muttrc.5 || die |
279 |
- doman mutt.1 muttrc.5 |
280 |
- else |
281 |
- # nuke manpages that should be provided by an MTA, bug #177605 |
282 |
- rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
283 |
- || ewarn "failed to remove files, please file a bug" |
284 |
- fi |
285 |
- |
286 |
- if use !prefix ; then |
287 |
- fowners root:mail /usr/bin/mutt_dotlock |
288 |
- fperms g+s /usr/bin/mutt_dotlock |
289 |
- fi |
290 |
- |
291 |
- dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
292 |
-} |
293 |
- |
294 |
-pkg_postinst() { |
295 |
- if [[ -z ${REPLACING_VERSIONS} ]] ; then |
296 |
- echo |
297 |
- elog "If you are new to mutt you may want to take a look at" |
298 |
- elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
299 |
- elog " https://wiki.gentoo.org/wiki/Mutt" |
300 |
- echo |
301 |
- else |
302 |
- ewarn "This release removes the conditional date feature in favour" |
303 |
- ewarn "of Dynamic \$index_format Content, see:" |
304 |
- ewarn " http://www.mutt.org/doc/manual/#index-format-hook" |
305 |
- fi |
306 |
- if use crypt || use gpg || use smime ; then |
307 |
- ewarn "Please note that the crypto related USE-flags of mutt have changed." |
308 |
- ewarn "To remove some unclarity, the following USE-flags are renamed:" |
309 |
- ewarn "(see https://bugs.gentoo.org/637176)" |
310 |
- ewarn " crypt -> pgp_classic" |
311 |
- ewarn " gpg -> gpgme" |
312 |
- ewarn " smime -> smime_classic" |
313 |
- ewarn "The old USE flags still work but their use is deprecated and will" |
314 |
- ewarn "be removed in a future release. Please update your package.use" |
315 |
- if use gpg && ( use crypt || use smime ) ; then |
316 |
- ewarn " Note that gpgme (old gpg) includes both pgp and smime" |
317 |
- ewarn " support. You can probably remove pgp_classic (old crypt)" |
318 |
- ewarn " and smime_classic (old smime) from your USE-flags and" |
319 |
- ewarn " only enable gpgme." |
320 |
- fi |
321 |
- fi |
322 |
- if use gpgme ; then |
323 |
- ewarn "Note: in order for Mutt to actually use the gpgme backend" |
324 |
- ewarn " you MUST include 'set crypt_use_gpgme=yes' in .muttrc" |
325 |
- ewarn " https://dev.mutt.org/doc/manual.html#crypt-use-gpgme" |
326 |
- fi |
327 |
-} |
328 |
|
329 |
diff --git a/mail-client/mutt/mutt-1.11.1-r2.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild |
330 |
similarity index 99% |
331 |
rename from mail-client/mutt/mutt-1.11.1-r2.ebuild |
332 |
rename to mail-client/mutt/mutt-1.11.4.ebuild |
333 |
index 9471fe0aa43..e7a091241ec 100644 |
334 |
--- a/mail-client/mutt/mutt-1.11.1-r2.ebuild |
335 |
+++ b/mail-client/mutt/mutt-1.11.4.ebuild |
336 |
@@ -5,7 +5,7 @@ EAPI="6" |
337 |
|
338 |
inherit eutils flag-o-matic autotools |
339 |
|
340 |
-PATCHREV="r2" |
341 |
+PATCHREV="r0" |
342 |
PATCHSET="gentoo-${PVR}/${PATCHREV}" |
343 |
|
344 |
DESCRIPTION="A small but very powerful text-based mail client" |