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