1 |
commit: f92f01770bf963e04ded937930afacc762f8f6b3 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 25 19:58:06 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 25 20:04:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92f0177 |
7 |
|
8 |
mail-client/mutt: version bump to 1.8.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.2-prefix, Repoman-2.3.1 |
11 |
|
12 |
mail-client/mutt/Manifest | 2 + |
13 |
mail-client/mutt/mutt-1.8.0.ebuild | 250 +++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 252 insertions(+) |
15 |
|
16 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
17 |
index 84663e0e3f..26401d7464 100644 |
18 |
--- a/mail-client/mutt/Manifest |
19 |
+++ b/mail-client/mutt/Manifest |
20 |
@@ -3,6 +3,8 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854 |
21 |
DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7 |
22 |
DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023 |
23 |
DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4 |
24 |
+DIST mutt-1.8.0.tar.gz 4116223 SHA256 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab SHA512 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d WHIRLPOOL 5a47aa961a3172b8ff731ce2ad19eb6cece6f31fc18cad8bb6cba821670a3a5c17196447c2711bc7be9f40826c8d6b25c3081bd0b8366f1921487f05c5ca641b |
25 |
DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c |
26 |
DIST mutt-gentoo-1.7.2-patches-r2.tar.xz 152992 SHA256 ac6f017f5d4b14d44a8d5d71e7cdeac59ba381a35ddff2db329e1d0a1af23720 SHA512 b96c658e151ee6b47a46b91311d9b9de002ae8ba6438d6e628f75722e9e66de5010b6ee6691f26ed0b9ba60aa4d96eee23bff39b7e6a27621e69d33701fafb01 WHIRLPOOL 3bb959a58eea74e9286146f0436a499a923c9d451d3d5fe6cef18bf9aa2038a5ce2f9c6514f5fe0c0297a5791fe1de135744eb7149b1c741cd1665a18c8224eb |
27 |
DIST mutt-gentoo-1.7.2-patches-r3.tar.xz 157048 SHA256 6355352d77b4297f4c1a6c2ff3e5877ed03b735ecb9b032dd0ac82e732a748e5 SHA512 31e71b8d444c93a4db13fea2bfb04dca12e252ea57a6cc77aea74213025ba57fdae207aa1d3a0ef3d0f22617edf090ddd6141d7aa87e03bd896dc4bc98bc3b99 WHIRLPOOL cec7f3b335a5f673a0b6b78a2b807a4432bcfb4df52a28665b74fcf367257d33fcb7a3e594be15453574cf6a22ef63a2bbdffa9124a529229abb71456070bf3d |
28 |
+DIST mutt-gentoo-1.8.0-patches-r0.tar.xz 111704 SHA256 7b24b214a2b4f091182ae21cc70d07c034abe9951361c7a4625c8633fc04ca4a SHA512 3532984efd0c335edca53e0082ccf9202d95d5f37896d47828ff764d3757f449bfaac401b6dc6fa9c8f1bdf4e32e839de07853cbeb7e5ed66f515db14d4041c7 WHIRLPOOL a0e48d7d61e25b440278f4b240475347b534c709ee97061fcacb41bc52715c60bf90503139d1cdcae40d209b80228bde91ced18cf492f2575c1a116d836840bd |
29 |
|
30 |
diff --git a/mail-client/mutt/mutt-1.8.0.ebuild b/mail-client/mutt/mutt-1.8.0.ebuild |
31 |
new file mode 100644 |
32 |
index 0000000000..777f7c1f12 |
33 |
--- /dev/null |
34 |
+++ b/mail-client/mutt/mutt-1.8.0.ebuild |
35 |
@@ -0,0 +1,250 @@ |
36 |
+# Copyright 1999-2017 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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" |
53 |
+REQUIRED_USE=" |
54 |
+ hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) |
55 |
+ imap? ( ssl ) |
56 |
+ pop? ( ssl ) |
57 |
+ nntp? ( ssl ) |
58 |
+ smime? ( ssl !gnutls ) |
59 |
+ smtp? ( ssl ) |
60 |
+ sasl? ( || ( imap pop smtp nntp ) ) |
61 |
+ kerberos? ( || ( imap pop smtp nntp ) )" |
62 |
+SLOT="0" |
63 |
+LICENSE="GPL-2" |
64 |
+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" |
65 |
+CDEPEND=" |
66 |
+ app-misc/mime-types |
67 |
+ |
68 |
+ berkdb? ( >=sys-libs/db-4:= ) |
69 |
+ gdbm? ( sys-libs/gdbm ) |
70 |
+ lmdb? ( dev-db/lmdb:= ) |
71 |
+ qdbm? ( dev-db/qdbm ) |
72 |
+ tokyocabinet? ( dev-db/tokyocabinet ) |
73 |
+ |
74 |
+ ssl? ( |
75 |
+ gnutls? ( >=net-libs/gnutls-1.0.17:= ) |
76 |
+ !gnutls? ( |
77 |
+ libressl? ( dev-libs/libressl:= ) |
78 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0= ) |
79 |
+ ) |
80 |
+ ) |
81 |
+ |
82 |
+ nls? ( virtual/libintl ) |
83 |
+ sasl? ( >=dev-libs/cyrus-sasl-2 ) |
84 |
+ kerberos? ( virtual/krb5 ) |
85 |
+ idn? ( net-dns/libidn ) |
86 |
+ gpg? ( >=app-crypt/gpgme-0.9.0:= ) |
87 |
+ notmuch? ( net-mail/notmuch:= ) |
88 |
+ slang? ( sys-libs/slang ) |
89 |
+ !slang? ( >=sys-libs/ncurses-5.2:0= ) |
90 |
+" |
91 |
+DEPEND="${CDEPEND} |
92 |
+ net-mail/mailbase |
93 |
+ doc? ( |
94 |
+ dev-libs/libxml2 |
95 |
+ dev-libs/libxslt |
96 |
+ app-text/docbook-xsl-stylesheets |
97 |
+ || ( www-client/lynx www-client/w3m www-client/elinks ) |
98 |
+ )" |
99 |
+RDEPEND="${CDEPEND} |
100 |
+ selinux? ( sec-policy/selinux-mutt ) |
101 |
+" |
102 |
+ |
103 |
+src_prepare() { |
104 |
+ local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches |
105 |
+ |
106 |
+ if use !vanilla ; then |
107 |
+ # apply patches |
108 |
+ export EPATCH_FORCE="yes" |
109 |
+ export EPATCH_SUFFIX="patch" |
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 /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 |
+} |