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