1 |
commit: 1ab08c3c1c1dbfc2799f3c56f6207d7a489f5c0d |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 9 19:13:52 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 9 19:14:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab08c3c |
7 |
|
8 |
mail-client/mutt: version bump to 1.9.0, bug #629748 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
mail-client/mutt/Manifest | 2 + |
13 |
mail-client/mutt/mutt-1.9.0.ebuild | 252 +++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 254 insertions(+) |
15 |
|
16 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
17 |
index 67f9939b19b..fa360b6715d 100644 |
18 |
--- a/mail-client/mutt/Manifest |
19 |
+++ b/mail-client/mutt/Manifest |
20 |
@@ -1,4 +1,6 @@ |
21 |
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4 |
22 |
DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d |
23 |
+DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6 |
24 |
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c |
25 |
DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999 |
26 |
+DIST mutt-gentoo-1.9.0-patches-r0.tar.xz 110868 SHA256 c634dd4c59be6489b8a69d0fe60095aea2013ad7403acc83472797d37413e31c SHA512 1abf29432e569c7adc99d3cb3c6f3efc843987e43354229c6cf99e55f7adec6b3e509b9e1c7f2f4029900c7013ba6dd330758e0f4e33e1a2b590a7bb89797fbc WHIRLPOOL ec6f2d836f2abf18335f6eb5d27f7e157bdb0ef979458e49399ddcf39ff437f359a36a795754abb36564d4765cecd4f7b4ab3408837140c34241f71e689502bf |
27 |
|
28 |
diff --git a/mail-client/mutt/mutt-1.9.0.ebuild b/mail-client/mutt/mutt-1.9.0.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..f7385cf0194 |
31 |
--- /dev/null |
32 |
+++ b/mail-client/mutt/mutt-1.9.0.ebuild |
33 |
@@ -0,0 +1,252 @@ |
34 |
+# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI="6" |
38 |
+ |
39 |
+inherit eutils flag-o-matic autotools |
40 |
+ |
41 |
+PATCHREV="r0" |
42 |
+PATCHSET="gentoo-${PVR}/${PATCHREV}" |
43 |
+ |
44 |
+DESCRIPTION="A small but very powerful text-based mail client" |
45 |
+HOMEPAGE="http://www.mutt.org/" |
46 |
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz" |
47 |
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz |
48 |
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz |
49 |
+ https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" |
50 |
+IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix" |
51 |
+REQUIRED_USE=" |
52 |
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
53 |
+ imap? ( ssl ) |
54 |
+ pop? ( ssl ) |
55 |
+ nntp? ( ssl ) |
56 |
+ smime? ( ssl !gnutls ) |
57 |
+ smtp? ( ssl ) |
58 |
+ sasl? ( || ( imap pop smtp nntp ) ) |
59 |
+ kerberos? ( || ( imap pop smtp nntp ) )" |
60 |
+SLOT="0" |
61 |
+LICENSE="GPL-2" |
62 |
+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" |
63 |
+CDEPEND=" |
64 |
+ app-misc/mime-types |
65 |
+ |
66 |
+ berkdb? ( >=sys-libs/db-4:= ) |
67 |
+ gdbm? ( sys-libs/gdbm ) |
68 |
+ lmdb? ( dev-db/lmdb:= ) |
69 |
+ qdbm? ( dev-db/qdbm ) |
70 |
+ tokyocabinet? ( dev-db/tokyocabinet ) |
71 |
+ |
72 |
+ ssl? ( |
73 |
+ gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
74 |
+ !gnutls? ( |
75 |
+ libressl? ( dev-libs/libressl:= ) |
76 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= ) |
77 |
+ ) |
78 |
+ ) |
79 |
+ |
80 |
+ nls? ( virtual/libintl ) |
81 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
82 |
+ kerberos? ( virtual/krb5 ) |
83 |
+ idn? ( net-dns/libidn ) |
84 |
+ gpg? ( >=app-crypt/gpgme-0.9.0:= ) |
85 |
+ notmuch? ( net-mail/notmuch:= ) |
86 |
+ slang? ( sys-libs/slang ) |
87 |
+ !slang? ( >=sys-libs/ncurses-5.2:0= ) |
88 |
+" |
89 |
+DEPEND="${CDEPEND} |
90 |
+ net-mail/mailbase |
91 |
+ doc? ( |
92 |
+ dev-libs/libxml2 |
93 |
+ dev-libs/libxslt |
94 |
+ app-text/docbook-xsl-stylesheets |
95 |
+ || ( www-client/lynx www-client/w3m www-client/elinks ) |
96 |
+ )" |
97 |
+RDEPEND="${CDEPEND} |
98 |
+ selinux? ( sec-policy/selinux-mutt ) |
99 |
+" |
100 |
+ |
101 |
+src_prepare() { |
102 |
+ local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches |
103 |
+ |
104 |
+ if use !vanilla ; then |
105 |
+ # apply patches |
106 |
+ export EPATCH_FORCE="yes" |
107 |
+ export EPATCH_SUFFIX="patch" |
108 |
+ # http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8 |
109 |
+ # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8 |
110 |
+ local patches=( |
111 |
+ patches-mutt |
112 |
+ bugs-gentoo |
113 |
+ features-common |
114 |
+ features-extra |
115 |
+ gentoo |
116 |
+ ) |
117 |
+ local patchset |
118 |
+ for patchset in "${patches[@]}" ; do |
119 |
+ [[ -d "${PATCHDIR}/${patchset}" ]] || continue |
120 |
+ einfo "Applying ${PATCHSET} patchset ${patchset}" |
121 |
+ EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ |
122 |
+ || die "patchset ${patchset} failed" |
123 |
+ done |
124 |
+ # add some explanation as to why not to go upstream |
125 |
+ sed -i \ |
126 |
+ -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\\' \ |
127 |
+ main.c || die "Failed to add bug instructions" |
128 |
+ fi |
129 |
+ |
130 |
+ local upatches= |
131 |
+ # allow user patches |
132 |
+ eapply_user && upatches=" with user patches" |
133 |
+ |
134 |
+ # patch version string for bug reports |
135 |
+ local patchset= |
136 |
+ use vanilla || patchset=", ${PATCHSET}" |
137 |
+ sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ |
138 |
+ muttlib.c || die "failed patching in Gentoo version" |
139 |
+ |
140 |
+ # many patches touch the buildsystem, we always need this |
141 |
+ AT_M4DIR="m4" eautoreconf |
142 |
+ |
143 |
+ # the configure script contains some "cleverness" whether or not to setgid |
144 |
+ # the dotlock program, resulting in bugs like #278332 |
145 |
+ sed -i -e 's/@DOTLOCK_GROUP@//' \ |
146 |
+ Makefile.in || die "sed failed" |
147 |
+} |
148 |
+ |
149 |
+src_configure() { |
150 |
+ local myconf=( |
151 |
+ "$(use_enable crypt pgp)" |
152 |
+ "$(use_enable debug)" |
153 |
+ "$(use_enable doc)" |
154 |
+ "$(use_enable gpg gpgme)" |
155 |
+ "$(use_enable nls)" |
156 |
+ "$(use_enable notmuch)" |
157 |
+ "$(use_enable sidebar)" |
158 |
+ "$(use_enable smime)" |
159 |
+ |
160 |
+ "$(use_enable imap)" |
161 |
+ "$(use_enable pop)" |
162 |
+ "$(use_enable nntp)" |
163 |
+ "$(use_enable smtp)" |
164 |
+ |
165 |
+ $(use ssl && use gnutls && echo --with-gnutls --without-ssl) |
166 |
+ $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) |
167 |
+ $(use !ssl && echo --without-gnutls --without-ssl) |
168 |
+ |
169 |
+ "$(use_with idn)" |
170 |
+ "$(use_with kerberos gss)" |
171 |
+ "$(use_with sasl)" |
172 |
+ "$(use slang && echo --with-slang=${EPREFIX}/usr)" |
173 |
+ "$(use_with !slang curses ${EPREFIX}/usr)" |
174 |
+ |
175 |
+ "--enable-compressed" |
176 |
+ "--enable-external-dotlock" |
177 |
+ "--enable-nfs-fix" |
178 |
+ "--sysconfdir=${EPREFIX}/etc/${PN}" |
179 |
+ "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}" |
180 |
+ "--with-regex" |
181 |
+ "--with-exec-shell=${EPREFIX}/bin/sh" |
182 |
+ ) |
183 |
+ |
184 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
185 |
+ # arrows in index view do not show when using wchar_t |
186 |
+ myconf+=( "--without-wc-funcs" ) |
187 |
+ fi |
188 |
+ |
189 |
+ # REQUIRED_USE should have selected only one of these |
190 |
+ local hcaches=( |
191 |
+ "berkdb:bdb" |
192 |
+ "gdbm" |
193 |
+ "lmdb" |
194 |
+ "qdbm" |
195 |
+ "tokyocabinet" |
196 |
+ ) |
197 |
+ local ucache hcache lcache |
198 |
+ for hcache in "${hcaches[@]}" ; do |
199 |
+ if use ${hcache%%:*} ; then |
200 |
+ ucache=${hcache} |
201 |
+ break |
202 |
+ fi |
203 |
+ done |
204 |
+ if [[ -n ${ucache} ]] ; then |
205 |
+ myconf+=( "--enable-hcache" ) |
206 |
+ else |
207 |
+ myconf+=( "--disable-hcache" ) |
208 |
+ fi |
209 |
+ for hcache in "${hcaches[@]}" ; do |
210 |
+ [[ ${hcache} == ${ucache} ]] \ |
211 |
+ && myconf+=( "--with-${hcache#*:}" ) \ |
212 |
+ || myconf+=( "--without-${hcache#*:}" ) |
213 |
+ done |
214 |
+ |
215 |
+ if use mbox; then |
216 |
+ myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) |
217 |
+ else |
218 |
+ myconf+=( "--with-homespool=Maildir" ) |
219 |
+ fi |
220 |
+ |
221 |
+ econf "${myconf[@]}" || die "configure failed" |
222 |
+} |
223 |
+ |
224 |
+src_install() { |
225 |
+ emake DESTDIR="${D}" install || die "install failed" |
226 |
+ if use mbox; then |
227 |
+ insinto /etc/mutt |
228 |
+ newins "${FILESDIR}"/Muttrc.mbox Muttrc |
229 |
+ else |
230 |
+ insinto /etc/mutt |
231 |
+ doins "${FILESDIR}"/Muttrc |
232 |
+ fi |
233 |
+ |
234 |
+ # A newer file is provided by app-misc/mime-types. So we link it. |
235 |
+ rm "${ED}"/etc/${PN}/mime.types |
236 |
+ dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types |
237 |
+ |
238 |
+ # A man-page is always handy, so fake one |
239 |
+ if use !doc; then |
240 |
+ emake -C doc DESTDIR="${D}" muttrc.man || die |
241 |
+ # make the fake slightly better, bug #413405 |
242 |
+ sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ |
243 |
+ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ |
244 |
+ -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \ |
245 |
+ -e "s#@bindir@#${EPREFIX}/usr/bin#" \ |
246 |
+ doc/mutt.man > mutt.1 |
247 |
+ cp doc/muttbug.man flea.1 |
248 |
+ cp doc/muttrc.man muttrc.5 |
249 |
+ doman mutt.1 flea.1 muttrc.5 |
250 |
+ else |
251 |
+ # nuke manpages that should be provided by an MTA, bug #177605 |
252 |
+ rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
253 |
+ || ewarn "failed to remove files, please file a bug" |
254 |
+ fi |
255 |
+ |
256 |
+ if use !prefix ; then |
257 |
+ fowners root:mail /usr/bin/mutt_dotlock |
258 |
+ fperms g+s /usr/bin/mutt_dotlock |
259 |
+ fi |
260 |
+ |
261 |
+ dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
262 |
+} |
263 |
+ |
264 |
+pkg_postinst() { |
265 |
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then |
266 |
+ echo |
267 |
+ elog "If you are new to mutt you may want to take a look at" |
268 |
+ elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
269 |
+ elog " https://wiki.gentoo.org/wiki/Mutt" |
270 |
+ echo |
271 |
+ else |
272 |
+ local ver |
273 |
+ local preconddate= |
274 |
+ for ver in ${REPLACING_VERSIONS} ; do |
275 |
+ [[ ${ver} == "1.5"* || ${ver} == "1.6"* ]] && preconddate=true |
276 |
+ done |
277 |
+ if [[ -n ${preconddate} ]] ; then |
278 |
+ echo |
279 |
+ elog "The SmartTime functionality has been replaced with" |
280 |
+ elog "CondDate feature. To mimic SmartTime, use this CondDate formatter:" |
281 |
+ elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>" |
282 |
+ echo |
283 |
+ fi |
284 |
+ fi |
285 |
+} |