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