Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-client/mutt: mutt-1.5.20-r10.ebuild ChangeLog mutt-1.5.20-r9.ebuild
Date: Tue, 29 Dec 2009 10:37:04
Message-Id: E1NPZRk-0002sh-F9@stork.gentoo.org
1 grobian 09/12/29 10:37:00
2
3 Modified: ChangeLog
4 Added: mutt-1.5.20-r10.ebuild
5 Removed: mutt-1.5.20-r9.ebuild
6 Log:
7 Bump for patch to fix subject not properly being truncated when there are tree arrows on the same line
8 (Portage version: 2.2.00.15153-prefix/cvs/Darwin powerpc)
9
10 Revision Changes Path
11 1.172 mail-client/mutt/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.172&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.172&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/ChangeLog?r1=1.171&r2=1.172
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v
20 retrieving revision 1.171
21 retrieving revision 1.172
22 diff -u -r1.171 -r1.172
23 --- ChangeLog 17 Dec 2009 11:38:25 -0000 1.171
24 +++ ChangeLog 29 Dec 2009 10:36:59 -0000 1.172
25 @@ -1,6 +1,14 @@
26 # ChangeLog for mail-client/mutt
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.171 2009/12/17 11:38:25 grobian Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.172 2009/12/29 10:36:59 grobian Exp $
30 +
31 +*mutt-1.5.20-r10 (29 Dec 2009)
32 +
33 + 29 Dec 2009; Fabian Groffen <grobian@g.o> -mutt-1.5.20-r9.ebuild,
34 + +mutt-1.5.20-r10.ebuild,
35 + +files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch:
36 + Bump for patch to fix subject not properly being truncated when there are
37 + tree arrows on the same line
38
39 17 Dec 2009; Fabian Groffen <grobian@g.o> mutt-1.5.20-r6,
40 mutt-1.5.20-r9.ebuild:
41
42
43
44 1.1 mail-client/mutt/mutt-1.5.20-r10.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild?rev=1.1&content-type=text/plain
48
49 Index: mutt-1.5.20-r10.ebuild
50 ===================================================================
51 # Copyright 1999-2009 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.1 2009/12/29 10:36:59 grobian Exp $
54
55 inherit eutils flag-o-matic autotools
56
57 PATCHSET_REV="-r4"
58
59 # note: latest sidebar patches can be found here:
60 # http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
61 SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.txt"
62
63 DESCRIPTION="a small but very powerful text-based mail client"
64 HOMEPAGE="http://www.mutt.org"
65 SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
66 !vanilla? (
67 !sidebar? (
68 mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
69 http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
70 )
71 )
72 sidebar? (
73 http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
74 )"
75 IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla"
76 SLOT="0"
77 LICENSE="GPL-2"
78 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
79 RDEPEND=">=sys-libs/ncurses-5.2
80 tokyocabinet? ( dev-db/tokyocabinet )
81 !tokyocabinet? (
82 qdbm? ( dev-db/qdbm )
83 !qdbm? (
84 gdbm? ( sys-libs/gdbm )
85 !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
86 )
87 )
88 imap? (
89 gnutls? ( >=net-libs/gnutls-1.0.17 )
90 !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
91 sasl? ( >=dev-libs/cyrus-sasl-2 )
92 )
93 pop? (
94 gnutls? ( >=net-libs/gnutls-1.0.17 )
95 !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
96 sasl? ( >=dev-libs/cyrus-sasl-2 )
97 )
98 smtp? (
99 gnutls? ( >=net-libs/gnutls-1.0.17 )
100 !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
101 sasl? ( >=dev-libs/cyrus-sasl-2 )
102 )
103 idn? ( net-dns/libidn )
104 gpg? ( >=app-crypt/gpgme-0.9.0 )
105 smime? ( >=dev-libs/openssl-0.9.6 )
106 app-misc/mime-types"
107 DEPEND="${RDEPEND}
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
116 PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
117
118 src_unpack() {
119 unpack ${A//${SIDEBAR_PATCH_N}}
120 cd "${S}"
121
122 # this patch is non-generic and only works because we use a sysconfdir
123 # different from the one used by the mailbase ebuild
124 use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
125
126 epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
127 epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
128 built_with_use sys-libs/ncurses unicode && \
129 epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
130 epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
131 epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
132
133 # post-release hot-fixes
134 epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
135 epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
136 epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
137 epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
138 epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
139 epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
140 epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
141 epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch
142 epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
143 epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch
144 epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch
145 epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch
146 epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch
147 epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch
148 epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch
149 epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch
150 epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch
151 epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch
152 epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch
153 epatch "${FILESDIR}"/mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch
154 epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch
155 epatch "${FILESDIR}"/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
156 epatch "${FILESDIR}"/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
157 epatch "${FILESDIR}"/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
158
159 # patch version string for bug reports
160 sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
161 muttlib.c || die "failed patching in Gentoo version"
162
163 if use !vanilla && use !sidebar ; then
164 use nntp || rm "${PATCHDIR}"/06-nntp.patch
165 for p in "${PATCHDIR}"/*.patch ; do
166 epatch "${p}"
167 done
168 fi
169
170 if use sidebar ; then
171 use vanilla || \
172 ewarn "the sidebar patch is only applied to a vanilla mutt tree"
173 epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
174 fi
175
176 AT_M4DIR="m4" eautoreconf
177
178 # the configure script contains some "cleverness" whether or not to setgid
179 # the dotlock program, resulting in bugs like #278332
180 sed -i -e 's/@DOTLOCK_GROUP@//' \
181 Makefile.in || die "sed failed"
182
183 # don't just build documentation (lengthy process, with big dependencies)
184 if use !doc ; then
185 sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
186 fi
187 }
188
189 src_compile() {
190 declare myconf="
191 $(use_enable nls) \
192 $(use_enable gpg gpgme) \
193 $(use_enable imap) \
194 $(use_enable pop) \
195 $(use_enable smtp) \
196 $(use_enable crypt pgp) \
197 $(use_enable smime) \
198 $(use_enable debug) \
199 $(use_with idn) \
200 --with-curses \
201 --sysconfdir="${EPREFIX}"/etc/${PN} \
202 --with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
203 --with-regex \
204 --enable-nfs-fix --enable-external-dotlock \
205 $(use_with !nntp mixmaster) \
206 --with-exec-shell=${EPREFIX}/bin/sh"
207
208 case $CHOST in
209 *-darwin7)
210 # locales are broken on Panther
211 myconf="${myconf} --enable-locales-fix --without-wc-funcs"
212 myconf="${myconf} --disable-fcntl --enable-flock"
213 ;;
214 *-solaris*)
215 # Solaris has no flock in the standard headers
216 myconf="${myconf} --enable-fcntl --disable-flock"
217 ;;
218 *)
219 myconf="${myconf} --disable-fcntl --enable-flock"
220 ;;
221 esac
222
223 # See Bug #22787
224 unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
225
226 # mutt prioritizes gdbm over bdb, so we will too.
227 # hcache feature requires at least one database is in USE.
228 if use tokyocabinet; then
229 myconf="${myconf} --enable-hcache \
230 --with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
231 elif use qdbm; then
232 myconf="${myconf} --enable-hcache \
233 --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
234 elif use gdbm ; then
235 myconf="${myconf} --enable-hcache \
236 --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
237 elif use berkdb; then
238 myconf="${myconf} --enable-hcache \
239 --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
240 else
241 myconf="${myconf} --disable-hcache \
242 --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
243 fi
244
245 # there's no need for gnutls, ssl or sasl without socket support
246 if use pop || use imap || use smtp ; then
247 if use gnutls; then
248 myconf="${myconf} --with-gnutls"
249 elif use ssl; then
250 myconf="${myconf} --with-ssl"
251 fi
252 # not sure if this should be mutually exclusive with the other two
253 myconf="${myconf} $(use_with sasl)"
254 else
255 myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
256 fi
257
258 if use mbox; then
259 myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
260 else
261 myconf="${myconf} --with-homespool=Maildir"
262 fi
263
264 if use !vanilla && use !sidebar ; then
265 # rr.compressed patch
266 myconf="${myconf} --enable-compressed"
267
268 # nntp patch applied conditionally, so avoid QA warning when doing
269 # --disable-nntp while patch not being applied, bug #262069
270 use nntp && myconf="${myconf} --enable-nntp"
271 fi
272
273 econf ${myconf} || die "configure failed"
274 emake || die "make failed"
275 }
276
277 src_install() {
278 local ED=${ED-${D}}
279 make DESTDIR="${D}" install || die "install failed"
280 find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
281 if use mbox; then
282 insinto /etc/mutt
283 newins "${FILESDIR}"/Muttrc.mbox Muttrc
284 else
285 insinto /etc/mutt
286 doins "${FILESDIR}"/Muttrc
287 fi
288
289 # A newer file is provided by app-misc/mime-types. So we link it.
290 rm "${ED}"/etc/${PN}/mime.types
291 dosym /etc/mime.types /etc/${PN}/mime.types
292
293 # A man-page is always handy
294 if use !doc; then
295 cp doc/mutt.man mutt.1
296 cp doc/muttbug.man flea.1
297 doman mutt.1 flea.1
298 else
299 # nuke manpages that should be provided by an MTA, bug #177605
300 rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
301 || ewarn "failed to remove files, please file a bug"
302 fi
303
304 if use !prefix ; then
305 fowners root:mail /usr/bin/mutt_dotlock
306 fperms g+s /usr/bin/mutt_dotlock
307 fi
308
309 dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
310 }
311
312 pkg_setup() {
313 if ! use gpg &&
314 has_version "<${CATEGORY}/${PN}-1.5.20-r2" &&
315 built_with_use ${CATEGORY}/${PN} gpgme ;
316 then
317 ewarn 'The "gpgme" USE-flag has been changed into "gpg". You'
318 ewarn 'previously had "gpgme" set, and you most likely want to'
319 ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.'
320 fi
321 }
322
323 pkg_postinst() {
324 echo
325 elog "If you are new to mutt you may want to take a look at"
326 elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
327 elog " http://www.gentoo.org/doc/en/guide-to-mutt.xml"
328 echo
329 }