1 |
grobian 11/04/26 17:32:15 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mutt-1.5.21-r2.ebuild |
5 |
Log: |
6 |
Revision bump with three fixes from upstream, added trash folder feature patch for GMail users, bug #364379 |
7 |
|
8 |
(Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc) |
9 |
|
10 |
Revision Changes Path |
11 |
1.214 mail-client/mutt/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.214&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.214&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/ChangeLog?r1=1.213&r2=1.214 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v |
20 |
retrieving revision 1.213 |
21 |
retrieving revision 1.214 |
22 |
diff -u -r1.213 -r1.214 |
23 |
--- ChangeLog 17 Apr 2011 18:07:58 -0000 1.213 |
24 |
+++ ChangeLog 26 Apr 2011 17:32:13 -0000 1.214 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for mail-client/mutt |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.213 2011/04/17 18:07:58 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.214 2011/04/26 17:32:13 grobian Exp $ |
30 |
+ |
31 |
+*mutt-1.5.21-r2 (26 Apr 2011) |
32 |
+ |
33 |
+ 26 Apr 2011; Fabian Groffen <grobian@g.o> +mutt-1.5.21-r2.ebuild: |
34 |
+ Revision bump with three fixes from upstream, added trash folder feature |
35 |
+ patch for GMail users, bug #364379 |
36 |
|
37 |
17 Apr 2011; Raúl Porcel <armin76@g.o> mutt-1.5.21-r1.ebuild: |
38 |
ia64/sparc stable wrt #357795 |
39 |
|
40 |
|
41 |
|
42 |
1.1 mail-client/mutt/mutt-1.5.21-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/mutt-1.5.21-r2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/mutt-1.5.21-r2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: mutt-1.5.21-r2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2011 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r2.ebuild,v 1.1 2011/04/26 17:32:14 grobian Exp $ |
52 |
|
53 |
EAPI="3" |
54 |
|
55 |
inherit eutils flag-o-matic autotools |
56 |
|
57 |
PATCHSET_REV="-r2" |
58 |
|
59 |
DESCRIPTION="A small but very powerful text-based mail client" |
60 |
HOMEPAGE="http://www.mutt.org" |
61 |
SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz |
62 |
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 |
63 |
http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2" |
64 |
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet" |
65 |
SLOT="0" |
66 |
LICENSE="GPL-2" |
67 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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" |
68 |
RDEPEND=">=sys-libs/ncurses-5.2 |
69 |
tokyocabinet? ( dev-db/tokyocabinet ) |
70 |
!tokyocabinet? ( |
71 |
qdbm? ( dev-db/qdbm ) |
72 |
!qdbm? ( |
73 |
gdbm? ( sys-libs/gdbm ) |
74 |
!gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) |
75 |
) |
76 |
) |
77 |
imap? ( |
78 |
gnutls? ( >=net-libs/gnutls-1.0.17 ) |
79 |
!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
80 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
81 |
) |
82 |
pop? ( |
83 |
gnutls? ( >=net-libs/gnutls-1.0.17 ) |
84 |
!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
85 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
86 |
) |
87 |
smtp? ( |
88 |
gnutls? ( >=net-libs/gnutls-1.0.17 ) |
89 |
!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
90 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
91 |
) |
92 |
idn? ( net-dns/libidn ) |
93 |
gpg? ( >=app-crypt/gpgme-0.9.0 ) |
94 |
smime? ( >=dev-libs/openssl-0.9.6 ) |
95 |
app-misc/mime-types" |
96 |
DEPEND="${RDEPEND} |
97 |
net-mail/mailbase |
98 |
doc? ( |
99 |
dev-libs/libxml2 |
100 |
dev-libs/libxslt |
101 |
app-text/docbook-xsl-stylesheets |
102 |
|| ( www-client/lynx www-client/w3m www-client/elinks ) |
103 |
)" |
104 |
|
105 |
PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} |
106 |
|
107 |
src_prepare() { |
108 |
# Post-release hot-fixes grabbed from HG, this is what all following |
109 |
# patches are based on in my Mercurial patchqueue (mq). |
110 |
# If you ever take over or need to modify patches here, just check |
111 |
# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and |
112 |
# the patchqueue as it'll save you a lot of work. |
113 |
# http://prefix.gentooexperimental.org:8000/mutt/ |
114 |
# http://prefix.gentooexperimental.org:8000/mutt-patches/ |
115 |
for rev in $(eval echo {0..${PR#r}}) ; do |
116 |
local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch |
117 |
[[ -e ${revpatch} ]] && \ |
118 |
epatch "${revpatch}" |
119 |
done |
120 |
|
121 |
# this patch is non-generic and only works because we use a sysconfdir |
122 |
# different from the one used by the mailbase ebuild |
123 |
use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch |
124 |
|
125 |
# must have fixes to compile or behave correctly, upstream |
126 |
# ignores, disagrees or simply doesn't respond/apply |
127 |
epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection |
128 |
epatch "${PATCHDIR}"/interix-btowc.patch |
129 |
epatch "${PATCHDIR}"/solaris-ncurses-chars.patch |
130 |
epatch "${PATCHDIR}"/gpgme-1.2.0.patch |
131 |
# same category, but functional bits |
132 |
epatch "${PATCHDIR}"/dont-reveal-bbc.patch |
133 |
|
134 |
# the big feature patches that upstream doesn't want to include, but |
135 |
# nearly every distro has due to their usefulness |
136 |
for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do |
137 |
epatch "${p}" |
138 |
done |
139 |
|
140 |
# we conditionalise this one, simply because it has considerable |
141 |
# impact on the code |
142 |
use sidebar && epatch "${PATCHDIR}"/sidebar.patch |
143 |
|
144 |
# patch version string for bug reports |
145 |
sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \ |
146 |
muttlib.c || die "failed patching in Gentoo version" |
147 |
|
148 |
# many patches touch the buildsystem, we always need this |
149 |
AT_M4DIR="m4" eautoreconf |
150 |
|
151 |
# the configure script contains some "cleverness" whether or not to setgid |
152 |
# the dotlock program, resulting in bugs like #278332 |
153 |
sed -i -e 's/@DOTLOCK_GROUP@//' \ |
154 |
Makefile.in || die "sed failed" |
155 |
|
156 |
# don't just build documentation (lengthy process, with big dependencies) |
157 |
if use !doc ; then |
158 |
sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die |
159 |
fi |
160 |
} |
161 |
|
162 |
src_configure() { |
163 |
local myconf=" |
164 |
$(use_enable crypt pgp) \ |
165 |
$(use_enable debug) \ |
166 |
$(use_enable gpg gpgme) \ |
167 |
$(use_enable imap) \ |
168 |
$(use_enable nls) \ |
169 |
$(use_enable nntp) \ |
170 |
$(use_enable pop) \ |
171 |
$(use_enable smime) \ |
172 |
$(use_enable smtp) \ |
173 |
$(use_with idn) \ |
174 |
$(use_with !nntp mixmaster) \ |
175 |
--enable-compressed \ |
176 |
--enable-external-dotlock \ |
177 |
--enable-nfs-fix \ |
178 |
--sysconfdir="${EPREFIX}"/etc/${PN} \ |
179 |
--with-curses \ |
180 |
--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \ |
181 |
--with-regex \ |
182 |
--with-exec-shell=${EPREFIX}/bin/sh" |
183 |
|
184 |
case $CHOST in |
185 |
*-solaris*) |
186 |
# Solaris has no flock in the standard headers |
187 |
myconf="${myconf} --enable-fcntl --disable-flock" |
188 |
;; |
189 |
*) |
190 |
myconf="${myconf} --disable-fcntl --enable-flock" |
191 |
;; |
192 |
esac |
193 |
|
194 |
# mutt prioritizes gdbm over bdb, so we will too. |
195 |
# hcache feature requires at least one database is in USE. |
196 |
if use tokyocabinet; then |
197 |
myconf="${myconf} --enable-hcache \ |
198 |
--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
199 |
elif use qdbm; then |
200 |
myconf="${myconf} --enable-hcache \ |
201 |
--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" |
202 |
elif use gdbm ; then |
203 |
myconf="${myconf} --enable-hcache \ |
204 |
--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" |
205 |
elif use berkdb; then |
206 |
myconf="${myconf} --enable-hcache \ |
207 |
--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" |
208 |
else |
209 |
myconf="${myconf} --disable-hcache \ |
210 |
--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" |
211 |
fi |
212 |
|
213 |
# there's no need for gnutls, ssl or sasl without socket support |
214 |
if use pop || use imap || use smtp ; then |
215 |
if use gnutls; then |
216 |
myconf="${myconf} --with-gnutls" |
217 |
elif use ssl; then |
218 |
myconf="${myconf} --with-ssl" |
219 |
fi |
220 |
# not sure if this should be mutually exclusive with the other two |
221 |
myconf="${myconf} $(use_with sasl)" |
222 |
else |
223 |
myconf="${myconf} --without-gnutls --without-ssl --without-sasl" |
224 |
fi |
225 |
|
226 |
if use mbox; then |
227 |
myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" |
228 |
else |
229 |
myconf="${myconf} --with-homespool=Maildir" |
230 |
fi |
231 |
|
232 |
econf ${myconf} || die "configure failed" |
233 |
} |
234 |
|
235 |
src_install() { |
236 |
make DESTDIR="${D}" install || die "install failed" |
237 |
if use mbox; then |
238 |
insinto /etc/mutt |
239 |
newins "${FILESDIR}"/Muttrc.mbox Muttrc |
240 |
else |
241 |
insinto /etc/mutt |
242 |
doins "${FILESDIR}"/Muttrc |
243 |
fi |
244 |
|
245 |
# A newer file is provided by app-misc/mime-types. So we link it. |
246 |
rm "${ED}"/etc/${PN}/mime.types |
247 |
dosym /etc/mime.types /etc/${PN}/mime.types |
248 |
|
249 |
# A man-page is always handy |
250 |
if use !doc; then |
251 |
cp doc/mutt.man mutt.1 |
252 |
cp doc/muttbug.man flea.1 |
253 |
doman mutt.1 flea.1 |
254 |
else |
255 |
# nuke manpages that should be provided by an MTA, bug #177605 |
256 |
rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \ |
257 |
|| ewarn "failed to remove files, please file a bug" |
258 |
fi |
259 |
|
260 |
if use !prefix ; then |
261 |
fowners root:mail /usr/bin/mutt_dotlock |
262 |
fperms g+s /usr/bin/mutt_dotlock |
263 |
fi |
264 |
|
265 |
dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
266 |
} |
267 |
|
268 |
pkg_postinst() { |
269 |
echo |
270 |
elog "If you are new to mutt you may want to take a look at" |
271 |
elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
272 |
elog " http://dev.gentoo.org/~grobian/guide-to-mutt.xml" |
273 |
echo |
274 |
} |