| 1 |
grobian 10/07/02 08:14:31 |
| 2 |
|
| 3 |
Modified: ChangeLog mutt-1.5.20-r15.ebuild |
| 4 |
Log: |
| 5 |
Cleanup logic for USE=sidebar. Add big fat warnings that USE=sidebar implies USE=vanilla, and that USE=vanilla excludes the use of zillions of bugfixes applied upstream since the last Mutt release. This should make things clearer for e.g. Bug #326197. |
| 6 |
(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.187 mail-client/mutt/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.187&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/ChangeLog?rev=1.187&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/ChangeLog?r1=1.186&r2=1.187 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v |
| 18 |
retrieving revision 1.186 |
| 19 |
retrieving revision 1.187 |
| 20 |
diff -u -r1.186 -r1.187 |
| 21 |
--- ChangeLog 12 Jun 2010 09:15:16 -0000 1.186 |
| 22 |
+++ ChangeLog 2 Jul 2010 08:14:30 -0000 1.187 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for mail-client/mutt |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.186 2010/06/12 09:15:16 grobian Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.187 2010/07/02 08:14:30 grobian Exp $ |
| 28 |
+ |
| 29 |
+ 02 Jul 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r15.ebuild: |
| 30 |
+ Cleanup logic for USE=sidebar. Add big fat warnings that USE=sidebar |
| 31 |
+ implies USE=vanilla, and that USE=vanilla excludes the use of zillions of |
| 32 |
+ bugfixes applied upstream since the last Mutt release. |
| 33 |
|
| 34 |
12 Jun 2010; Fabian Groffen <grobian@g.o> mutt-1.5.20-r15.ebuild, |
| 35 |
+files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 mail-client/mutt/mutt-1.5.20-r15.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: mutt-1.5.20-r15.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- mutt-1.5.20-r15.ebuild 12 Jun 2010 09:15:16 -0000 1.2 |
| 52 |
+++ mutt-1.5.20-r15.ebuild 2 Jul 2010 08:14:30 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.2 2010/06/12 09:15:16 grobian Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.3 2010/07/02 08:14:30 grobian Exp $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
|
| 61 |
@@ -83,7 +83,21 @@ |
| 62 |
epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch |
| 63 |
epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch |
| 64 |
|
| 65 |
- if use !vanilla ; then |
| 66 |
+ local pristine=$(use vanilla && echo yes) |
| 67 |
+ if use sidebar && use !vanilla ; then |
| 68 |
+ ewarn "due to the complexity of the sidebar patch and requests" |
| 69 |
+ ewarn "from the author of the patch, USE=sidebar implies USE=vanilla" |
| 70 |
+ pristine=yes |
| 71 |
+ fi |
| 72 |
+ if [[ ${pristine} == yes ]] ; then |
| 73 |
+ ewarn "USE=vanilla excludes any post-release or feature patches!" |
| 74 |
+ use sidebar && ewarn "(except the sidebar patch you requested)" |
| 75 |
+ ewarn "you are very likely to encounter known bugs due to upstream's" |
| 76 |
+ ewarn "\"almost never\" release policy, please only use USE=vanilla" |
| 77 |
+ ewarn "if you have to test an (almost) pristine mutt tarball." |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
+ if [[ ${pristine} != yes ]] ; then |
| 81 |
# fixes that are not yet upstream, or that upstream doesn't like |
| 82 |
epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch |
| 83 |
epatch "${FILESDIR}"/mutt-1.5.20-realpath-slowness.patch |
| 84 |
@@ -102,18 +116,12 @@ |
| 85 |
|
| 86 |
# the big feature patches that upstream doesn't want to include, but |
| 87 |
# nearly every distro has due to their usefulness |
| 88 |
- if use !sidebar ; then |
| 89 |
- use nntp || rm "${PATCHDIR}"/06-nntp.patch |
| 90 |
- for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do |
| 91 |
- epatch "${p}" |
| 92 |
- done |
| 93 |
- fi |
| 94 |
- fi |
| 95 |
- |
| 96 |
- if use sidebar ; then |
| 97 |
- use vanilla || \ |
| 98 |
- ewarn "the sidebar patch is only applied to a vanilla mutt tree" |
| 99 |
- epatch "${DISTDIR}"/${SIDEBAR_PATCH_N} |
| 100 |
+ use nntp || rm "${PATCHDIR}"/06-nntp.patch |
| 101 |
+ for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do |
| 102 |
+ epatch "${p}" |
| 103 |
+ done |
| 104 |
+ else |
| 105 |
+ use sidebar && epatch "${DISTDIR}"/${SIDEBAR_PATCH_N} |
| 106 |
fi |
| 107 |
|
| 108 |
AT_M4DIR="m4" eautoreconf |
Archives