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