1 |
grobian 09/07/02 08:44:33 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mutt-1.5.20-r1.ebuild |
5 |
Removed: mutt-1.5.20.ebuild |
6 |
Log: |
7 |
Bump for patch to fix bug #276101, regarding smtp batching with authentication. |
8 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.138 mail-client/mutt/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.138&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.138&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/ChangeLog?r1=1.137&r2=1.138 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v |
20 |
retrieving revision 1.137 |
21 |
retrieving revision 1.138 |
22 |
diff -u -r1.137 -r1.138 |
23 |
--- ChangeLog 29 Jun 2009 13:25:08 -0000 1.137 |
24 |
+++ ChangeLog 2 Jul 2009 08:44:33 -0000 1.138 |
25 |
@@ -1,6 +1,13 @@ |
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.137 2009/06/29 13:25:08 grobian Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.138 2009/07/02 08:44:33 grobian Exp $ |
30 |
+ |
31 |
+*mutt-1.5.20-r1 (02 Jul 2009) |
32 |
+ |
33 |
+ 02 Jul 2009; Fabian Groffen <grobian@g.o> |
34 |
+ +files/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch, |
35 |
+ -mutt-1.5.20.ebuild, +mutt-1.5.20-r1.ebuild: |
36 |
+ Bump for patch to fix bug #276101, regarding smtp batching with authentication. |
37 |
|
38 |
29 Jun 2009; Fabian Groffen <grobian@g.o> |
39 |
+files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch, |
40 |
|
41 |
|
42 |
|
43 |
1.1 mail-client/mutt/mutt-1.5.20-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/mutt-1.5.20-r1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mutt/mutt-1.5.20-r1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: mutt-1.5.20-r1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2009 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r1.ebuild,v 1.1 2009/07/02 08:44:33 grobian Exp $ |
53 |
|
54 |
inherit eutils flag-o-matic autotools |
55 |
|
56 |
PATCHSET_REV="-r2" |
57 |
|
58 |
# note: latest sidebar patches can be found here: |
59 |
# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44 |
60 |
SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.txt" |
61 |
|
62 |
DESCRIPTION="a small but very powerful text-based mail client" |
63 |
HOMEPAGE="http://www.mutt.org" |
64 |
SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz |
65 |
!vanilla? ( |
66 |
!sidebar? ( |
67 |
mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 |
68 |
http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 |
69 |
) |
70 |
) |
71 |
sidebar? ( |
72 |
http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N} |
73 |
)" |
74 |
IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl |
75 |
sidebar smime smtp ssl vanilla" |
76 |
SLOT="0" |
77 |
LICENSE="GPL-2" |
78 |
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" |
79 |
RDEPEND=">=sys-libs/ncurses-5.2 |
80 |
qdbm? ( dev-db/qdbm ) |
81 |
!qdbm? ( |
82 |
gdbm? ( sys-libs/gdbm ) |
83 |
!gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) |
84 |
) |
85 |
imap? ( |
86 |
gnutls? ( >=net-libs/gnutls-1.0.17 ) |
87 |
!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
88 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
89 |
) |
90 |
pop? ( |
91 |
gnutls? ( >=net-libs/gnutls-1.0.17 ) |
92 |
!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
93 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
94 |
) |
95 |
smtp? ( |
96 |
gnutls? ( >=net-libs/gnutls-1.0.17 ) |
97 |
!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) |
98 |
sasl? ( >=dev-libs/cyrus-sasl-2 ) |
99 |
) |
100 |
idn? ( net-dns/libidn ) |
101 |
gpgme? ( >=app-crypt/gpgme-0.9.0 ) |
102 |
smime? ( >=dev-libs/openssl-0.9.6 ) |
103 |
app-misc/mime-types" |
104 |
DEPEND="${RDEPEND} |
105 |
net-mail/mailbase |
106 |
!vanilla? ( |
107 |
dev-libs/libxml2 |
108 |
dev-libs/libxslt |
109 |
app-text/docbook-xsl-stylesheets |
110 |
|| ( www-client/lynx www-client/w3m www-client/elinks ) |
111 |
)" |
112 |
|
113 |
PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} |
114 |
|
115 |
src_unpack() { |
116 |
unpack ${A//${SIDEBAR_PATCH_N}} |
117 |
cd "${S}" |
118 |
|
119 |
# this patch is non-generic and only works because we use a sysconfdir |
120 |
# different from the one used by the mailbase ebuild |
121 |
use prefix && epatch "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch |
122 |
|
123 |
epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection |
124 |
epatch "${FILESDIR}"/mutt-1.5.18-interix.patch |
125 |
epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch |
126 |
# post-release hot-fixes |
127 |
epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch |
128 |
epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch |
129 |
epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch |
130 |
epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch |
131 |
epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch |
132 |
epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch |
133 |
epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch |
134 |
epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch |
135 |
epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch |
136 |
|
137 |
if use !vanilla && use !sidebar ; then |
138 |
use nntp || rm "${PATCHDIR}"/06-nntp.patch |
139 |
for p in "${PATCHDIR}"/*.patch ; do |
140 |
epatch "${p}" |
141 |
done |
142 |
fi |
143 |
|
144 |
if use sidebar ; then |
145 |
use vanilla || \ |
146 |
ewarn "The sidebar patch is only applied to a vanilla mutt tree." |
147 |
epatch "${DISTDIR}"/${SIDEBAR_PATCH_N} |
148 |
fi |
149 |
|
150 |
AT_M4DIR="m4" eautoreconf |
151 |
|
152 |
# this should be done only when we're not root |
153 |
if [[ ${UID} != 0 ]] ; then |
154 |
sed -i \ |
155 |
-e 's/@DOTLOCK_GROUP@/'"`id -gn`"'/g' \ |
156 |
Makefile.in \ |
157 |
|| die "sed failed" |
158 |
fi |
159 |
} |
160 |
|
161 |
src_compile() { |
162 |
declare myconf=" |
163 |
$(use_enable nls) \ |
164 |
$(use_enable gpgme) \ |
165 |
$(use_enable imap) \ |
166 |
$(use_enable pop) \ |
167 |
$(use_enable smtp) \ |
168 |
$(use_enable crypt pgp) \ |
169 |
$(use_enable smime) \ |
170 |
$(use_enable debug) \ |
171 |
$(use_with idn) \ |
172 |
--with-curses \ |
173 |
--sysconfdir="${EPREFIX}"/etc/${PN} \ |
174 |
--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \ |
175 |
--with-regex \ |
176 |
--enable-nfs-fix --enable-external-dotlock \ |
177 |
$(use_with !nntp mixmaster) \ |
178 |
--with-exec-shell=${EPREFIX}/bin/sh" |
179 |
|
180 |
case $CHOST in |
181 |
*-darwin7) |
182 |
# locales are broken on Panther |
183 |
myconf="${myconf} --enable-locales-fix --without-wc-funcs" |
184 |
myconf="${myconf} --disable-fcntl --enable-flock" |
185 |
;; |
186 |
*-solaris*) |
187 |
# Solaris has no flock in the standard headers |
188 |
myconf="${myconf} --enable-fcntl --disable-flock" |
189 |
;; |
190 |
*) |
191 |
myconf="${myconf} --disable-fcntl --enable-flock" |
192 |
;; |
193 |
esac |
194 |
|
195 |
# See Bug #22787 |
196 |
unset WANT_AUTOCONF_2_5 WANT_AUTOCONF |
197 |
|
198 |
# mutt prioritizes gdbm over bdb, so we will too. |
199 |
# hcache feature requires at least one database is in USE. |
200 |
if use qdbm; then |
201 |
myconf="${myconf} --enable-hcache \ |
202 |
--with-qdbm --without-gdbm --without-bdb" |
203 |
elif use gdbm ; then |
204 |
myconf="${myconf} --enable-hcache \ |
205 |
--without-qdbm --with-gdbm --without-bdb" |
206 |
elif use berkdb; then |
207 |
myconf="${myconf} --enable-hcache \ |
208 |
--without-gdbm --without-qdbm --with-bdb" |
209 |
else |
210 |
myconf="${myconf} --disable-hcache \ |
211 |
--without-qdbm --without-gdbm --without-bdb" |
212 |
fi |
213 |
|
214 |
# there's no need for gnutls, ssl or sasl without socket support |
215 |
if use pop || use imap || use smtp ; then |
216 |
if use gnutls; then |
217 |
myconf="${myconf} --with-gnutls" |
218 |
elif use ssl; then |
219 |
myconf="${myconf} --with-ssl" |
220 |
fi |
221 |
# not sure if this should be mutually exclusive with the other two |
222 |
myconf="${myconf} $(use_with sasl)" |
223 |
else |
224 |
myconf="${myconf} --without-gnutls --without-ssl --without-sasl" |
225 |
fi |
226 |
|
227 |
if use mbox; then |
228 |
myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail" |
229 |
else |
230 |
myconf="${myconf} --with-homespool=Maildir" |
231 |
fi |
232 |
|
233 |
if use !vanilla && use !sidebar ; then |
234 |
# rr.compressed patch |
235 |
myconf="${myconf} --enable-compressed" |
236 |
|
237 |
# nntp patch applied conditionally, so avoid QA warning when doing |
238 |
# --disable-nntp while patch not being applied, bug #262069 |
239 |
use nntp && myconf="${myconf} --enable-nntp" |
240 |
fi |
241 |
|
242 |
econf ${myconf} || die "configure failed" |
243 |
emake || die "make failed" |
244 |
} |
245 |
|
246 |
src_install() { |
247 |
local ED=${ED-${D}} |
248 |
make DESTDIR="${D}" install || die "install failed" |
249 |
find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip |
250 |
if use mbox; then |
251 |
insinto /etc/mutt |
252 |
newins "${FILESDIR}"/Muttrc.mbox Muttrc |
253 |
else |
254 |
insinto /etc/mutt |
255 |
doins "${FILESDIR}"/Muttrc |
256 |
fi |
257 |
|
258 |
# A newer file is provided by app-misc/mime-types. So we link it. |
259 |
rm "${ED}"/etc/${PN}/mime.types |
260 |
dosym /etc/mime.types /etc/${PN}/mime.types |
261 |
|
262 |
# charset.alias is installed by libiconv |
263 |
rm -f "${ED}"/usr/lib/charset.alias |
264 |
rm -f "${ED}"/usr/share/locale/locale.alias |
265 |
|
266 |
dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |
267 |
} |
268 |
|
269 |
pkg_postinst() { |
270 |
echo |
271 |
elog "If you are new to mutt you may want to take a look at" |
272 |
elog "the Gentoo QuickStart Guide to Mutt E-Mail:" |
273 |
elog " http://www.gentoo.org/doc/en/guide-to-mutt.xml" |
274 |
echo |
275 |
} |