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