1 |
commit: 2b6dd73b8ce4078cb0d809fee9b5b8cedab49861 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 9 14:27:12 2016 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 15:48:48 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6dd73b |
7 |
|
8 |
mail-client/mutt: version bump to 1.6.2, neomutt-20160709 |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
mail-client/mutt/Manifest | 2 + |
13 |
mail-client/mutt/mutt-1.6.2.ebuild | 260 +++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 262 insertions(+) |
15 |
|
16 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
17 |
index 90a552f..c85304a 100644 |
18 |
--- a/mail-client/mutt/Manifest |
19 |
+++ b/mail-client/mutt/Manifest |
20 |
@@ -9,3 +9,5 @@ DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0 |
21 |
DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4 |
22 |
DIST mutt-1.6.1-neomutt-patches-3d90396616d009a7dcbfbb17d8a74b3eee70bd9a.zip 538034 SHA256 d76441eb51295afccc060bfee40ef03ab1b865de1187ea1f26349281d11784a6 SHA512 ca5334c9d0a295cba8749d1d7315d6d7a8ac93f48cfd9a1e112f9b5dd61f808966ec320464aab282cc626c08764294844368dca1520bc9dc6029c12004b7bb50 WHIRLPOOL b14ae9b58c6ba81956caefe049a0c6706436700e060402a9d869d9b98b61d74df5478dd07ee9cd520c4e6012a22b01d29857f74a8e3955680948e06f4e04cbec |
23 |
DIST mutt-1.6.1.tar.gz 3956840 SHA256 98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5 WHIRLPOOL 8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712 |
24 |
+DIST mutt-1.6.2-patches-neomutt-20160709.tar.gz 498453 SHA256 9601f07fc163577f6222d2786c9ac8081d5498658e06ab1b646a16c6e2b61952 SHA512 9c0f069a82b72f5d1fc05c3edf4012a3044e2acf4cc1771bf7a4103c352bd165dd58e41f65434fb2e57464ce2981b3722c55e54b4c700b29863c7576f9cf1928 WHIRLPOOL 66291b9388bb089410146d53faddc540cf659caf129674cdbe8519eac89161c547e770a0094f630fff951b2cf8bf60404fe64804ae9c514c69301c1a3c894483 |
25 |
+DIST mutt-1.6.2.tar.gz 3956745 SHA256 c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916 WHIRLPOOL 4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de |
26 |
|
27 |
diff --git a/mail-client/mutt/mutt-1.6.2.ebuild b/mail-client/mutt/mutt-1.6.2.ebuild |
28 |
new file mode 100644 |
29 |
index 0000000..1323117 |
30 |
--- /dev/null |
31 |
+++ b/mail-client/mutt/mutt-1.6.2.ebuild |
32 |
@@ -0,0 +1,260 @@ |
33 |
+# Copyright 1999-2016 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+# $Id$ |
36 |
+ |
37 |
+EAPI="6" |
38 |
+ |
39 |
+inherit eutils flag-o-matic autotools |
40 |
+ |
41 |
+NEOMUTT="neomutt-20160709" |
42 |
+ |
43 |
+DESCRIPTION="A small but very powerful text-based mail client" |
44 |
+HOMEPAGE="http://www.mutt.org/" |
45 |
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
46 |
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
47 |
+ https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz" |
48 |
+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" |
49 |
+SLOT="0" |
50 |
+LICENSE="GPL-2" |
51 |
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
52 |
+CDEPEND=" |
53 |
+ app-misc/mime-types |
54 |
+ nls? ( virtual/libintl ) |
55 |
+ tokyocabinet? ( dev-db/tokyocabinet ) |
56 |
+ !tokyocabinet? ( |
57 |
+ qdbm? ( dev-db/qdbm ) |
58 |
+ !qdbm? ( |
59 |
+ gdbm? ( sys-libs/gdbm ) |
60 |
+ !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) |
61 |
+ ) |
62 |
+ ) |
63 |
+ imap? ( |
64 |
+ gnutls? ( >=net-libs/gnutls-1.0.17 ) |
65 |
+ !gnutls? ( |
66 |
+ ssl? ( |
67 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 ) |
68 |
+ libressl? ( dev-libs/libressl ) |
69 |
+ ) |
70 |
+ ) |
71 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
72 |
+ ) |
73 |
+ kerberos? ( virtual/krb5 ) |
74 |
+ pop? ( |
75 |
+ gnutls? ( >=net-libs/gnutls-1.0.17 ) |
76 |
+ !gnutls? ( |
77 |
+ ssl? ( |
78 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 ) |
79 |
+ libressl? ( dev-libs/libressl ) |
80 |
+ ) |
81 |
+ ) |
82 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
83 |
+ ) |
84 |
+ smtp? ( |
85 |
+ gnutls? ( >=net-libs/gnutls-1.0.17 ) |
86 |
+ !gnutls? ( |
87 |
+ ssl? ( |
88 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 ) |
89 |
+ libressl? ( dev-libs/libressl ) |
90 |
+ ) |
91 |
+ ) |
92 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
93 |
+ ) |
94 |
+ idn? ( net-dns/libidn ) |
95 |
+ gpg? ( >=app-crypt/gpgme-0.9.0 ) |
96 |
+ smime? ( |
97 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 ) |
98 |
+ libressl? ( dev-libs/libressl ) |
99 |
+ ) |
100 |
+ notmuch? ( net-mail/notmuch ) |
101 |
+ slang? ( sys-libs/slang ) |
102 |
+ !slang? ( >=sys-libs/ncurses-5.2:0 ) |
103 |
+" |
104 |
+DEPEND="${CDEPEND} |
105 |
+ net-mail/mailbase |
106 |
+ doc? ( |
107 |
+ dev-libs/libxml2 |
108 |
+ dev-libs/libxslt |
109 |
+ app-text/docbook-xsl-stylesheets |
110 |
+ || ( www-client/lynx www-client/w3m www-client/elinks ) |
111 |
+ )" |
112 |
+RDEPEND="${CDEPEND} |
113 |
+ selinux? ( sec-policy/selinux-mutt ) |
114 |
+" |
115 |
+ |
116 |
+src_prepare() { |
117 |
+ local PATCHDIR="${WORKDIR}"/integration-${NEOMUTT} |
118 |
+ |
119 |
+ # apply NeoMutt patches |
120 |
+ export EPATCH_FORCE="yes" |
121 |
+ export EPATCH_SUFFIX="patch" |
122 |
+ # order of patches from README.md |
123 |
+ local patches=( |
124 |
+ bugs-common |
125 |
+ features-common |
126 |
+ features-extra |
127 |
+ bugs-neomutt |
128 |
+ gentoo-pre |
129 |
+ gentoo |
130 |
+ ) |
131 |
+ local patchset |
132 |
+ for patchset in "${patches[@]}" ; do |
133 |
+ einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}" |
134 |
+ EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ |
135 |
+ || die "NeoMutt patchset ${patchset} failed" |
136 |
+ done |
137 |
+ # add some explanation as to why not going to upstream |
138 |
+ sed -i \ |
139 |
+ -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"' \ |
140 |
+ version.c || die "Failed to add bug instructions" |
141 |
+ |
142 |
+ local upatches= |
143 |
+ # allow user patches |
144 |
+ eapply_user && upatches=" with user patches" |
145 |
+ |
146 |
+ # patch version string for bug reports |
147 |
+ rm VERSION.neo || die # we already flag it appropriate |
148 |
+ sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \ |
149 |
+ muttlib.c || die "failed patching in Gentoo version" |
150 |
+ |
151 |
+ # many patches touch the buildsystem, we always need this |
152 |
+ AT_M4DIR="m4" eautoreconf |
153 |
+ |
154 |
+ # the configure script contains some "cleverness" whether or not to setgid |
155 |
+ # the dotlock program, resulting in bugs like #278332 |
156 |
+ sed -i -e 's/@DOTLOCK_GROUP@//' \ |
157 |
+ Makefile.in || die "sed failed" |
158 |
+ |
159 |
+ # don't just build documentation (lengthy process, with big dependencies) |
160 |
+ if use !doc ; then |
161 |
+ sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die |
162 |
+ fi |
163 |
+} |
164 |
+ |
165 |
+src_configure() { |
166 |
+ local myconf=" |
167 |
+ $(use_enable crypt pgp) \ |
168 |
+ $(use_enable debug) \ |
169 |
+ $(use_enable gpg gpgme) \ |
170 |
+ $(use_enable imap) \ |
171 |
+ $(use_enable nls) \ |
172 |
+ $(use_enable nntp) \ |
173 |
+ $(use_enable pop) \ |
174 |
+ $(use_enable sidebar) \ |
175 |
+ $(use_enable smime) \ |
176 |
+ $(use_enable smtp) \ |
177 |
+ $(use_enable notmuch) \ |
178 |
+ $(use_with idn) \ |
179 |
+ $(use_with kerberos gss) \ |
180 |
+ $(use slang && echo --with-slang=${EPREFIX}/usr) \ |
181 |
+ $(use !slang && echo --with-curses=${EPREFIX}/usr) \ |
182 |
+ --enable-compressed \ |
183 |
+ --enable-external-dotlock \ |
184 |
+ --enable-nfs-fix \ |
185 |
+ --sysconfdir=${EPREFIX}/etc/${PN} \ |
186 |
+ --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \ |
187 |
+ --with-regex \ |
188 |
+ --with-exec-shell=${EPREFIX}/bin/sh" |
189 |
+ |
190 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
191 |
+ # arrows in index view do not show when using wchar_t |
192 |
+ myconf+=" --without-wc-funcs" |
193 |
+ fi |
194 |
+ |
195 |
+ # mutt prioritizes gdbm over bdb, so we will too. |
196 |
+ # hcache feature requires at least one database is in USE. |
197 |
+ if use tokyocabinet; then |
198 |
+ myconf="${myconf} --enable-hcache \ |
199 |
+ --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
200 |
+ elif use qdbm; then |
201 |
+ myconf="${myconf} --enable-hcache \ |
202 |
+ --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" |
203 |
+ elif use gdbm ; then |
204 |
+ myconf="${myconf} --enable-hcache \ |
205 |
+ --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" |
206 |
+ elif use berkdb; then |
207 |
+ myconf="${myconf} --enable-hcache \ |
208 |
+ --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" |
209 |
+ else |
210 |
+ myconf="${myconf} --disable-hcache \ |
211 |
+ --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
212 |
+ fi |
213 |
+ |
214 |
+ # there's no need for gnutls, ssl or sasl without socket support |
215 |
+ if use pop || use imap || use smtp ; then |
216 |
+ if use gnutls; then |
217 |
+ myconf="${myconf} --with-gnutls" |
218 |
+ elif use ssl; then |
219 |
+ myconf="${myconf} --with-ssl" |
220 |
+ fi |
221 |
+ # not sure if this should be mutually exclusive with the other two |
222 |
+ myconf="${myconf} $(use_with sasl)" |
223 |
+ else |
224 |
+ myconf="${myconf} --without-gnutls --without-ssl --without-sasl" |
225 |
+ fi |
226 |
+ |
227 |
+ if use mbox; then |
228 |
+ myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" |
229 |
+ else |
230 |
+ myconf="${myconf} --with-homespool=Maildir" |
231 |
+ fi |
232 |
+ |
233 |
+ econf ${myconf} || die "configure failed" |
234 |
+} |
235 |
+ |
236 |
+src_install() { |
237 |
+ emake DESTDIR="${D}" install || die "install failed" |
238 |
+ if use mbox; then |
239 |
+ insinto /etc/mutt |
240 |
+ newins "${FILESDIR}"/Muttrc.mbox Muttrc |
241 |
+ else |
242 |
+ insinto /etc/mutt |
243 |
+ doins "${FILESDIR}"/Muttrc |
244 |
+ fi |
245 |
+ |
246 |
+ # A newer file is provided by app-misc/mime-types. So we link it. |
247 |
+ rm "${ED}"/etc/${PN}/mime.types |
248 |
+ dosym /etc/mime.types /etc/${PN}/mime.types |
249 |
+ |
250 |
+ # A man-page is always handy, so fake one |
251 |
+ if use !doc; then |
252 |
+ emake -C doc DESTDIR="${D}" muttrc.man || die |
253 |
+ # make the fake slightly better, bug #413405 |
254 |
+ sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ |
255 |
+ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ |
256 |
+ -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \ |
257 |
+ -e "s#@bindir@#${EPREFIX}/usr/bin#" \ |
258 |
+ doc/mutt.man > mutt.1 |
259 |
+ cp doc/muttbug.man flea.1 |
260 |
+ cp doc/muttrc.man muttrc.5 |
261 |
+ doman mutt.1 flea.1 muttrc.5 |
262 |
+ else |
263 |
+ # nuke manpages that should be provided by an MTA, bug #177605 |
264 |
+ rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
265 |
+ || ewarn "failed to remove files, please file a bug" |
266 |
+ fi |
267 |
+ |
268 |
+ if use !prefix ; then |
269 |
+ fowners root:mail /usr/bin/mutt_dotlock |
270 |
+ fperms g+s /usr/bin/mutt_dotlock |
271 |
+ fi |
272 |
+ |
273 |
+ dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
274 |
+} |
275 |
+ |
276 |
+pkg_postinst() { |
277 |
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then |
278 |
+ echo |
279 |
+ elog "If you are new to mutt you may want to take a look at" |
280 |
+ elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
281 |
+ elog " https://wiki.gentoo.org/wiki/Mutt" |
282 |
+ echo |
283 |
+ else |
284 |
+ echo |
285 |
+ elog "This version of Mutt is entirely based on NeoMutt patches." |
286 |
+ elog "Please visit http://www.neomutt.org/ to learn more about this project." |
287 |
+ elog "As a result, SmartTime functionality has been replaced with" |
288 |
+ elog "CondDate feature. To mimic SmartTime, use this CondDate formatter:" |
289 |
+ elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>" |
290 |
+ echo |
291 |
+ fi |
292 |
+} |