1 |
lack 11/07/13 04:22:33 |
2 |
|
3 |
Modified: vim.eclass |
4 |
Log: |
5 |
Altering vim patch logic to deal with monolithic patches (which include runtime |
6 |
file changes too) |
7 |
|
8 |
Revision Changes Path |
9 |
1.198 eclass/vim.eclass |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.198&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.198&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.197&r2=1.198 |
14 |
|
15 |
Index: vim.eclass |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v |
18 |
retrieving revision 1.197 |
19 |
retrieving revision 1.198 |
20 |
diff -u -r1.197 -r1.198 |
21 |
--- vim.eclass 13 Jul 2011 01:06:31 -0000 1.197 |
22 |
+++ vim.eclass 13 Jul 2011 04:22:33 -0000 1.198 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2011 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.197 2011/07/13 01:06:31 lack Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.198 2011/07/13 04:22:33 lack Exp $ |
28 |
|
29 |
# Authors: |
30 |
# Jim Ramsay <lack@g.o> |
31 |
@@ -262,7 +262,12 @@ |
32 |
cvs_src_unpack |
33 |
else |
34 |
# Apply any patches available from vim.org for this version |
35 |
- [[ -n "$VIM_ORG_PATCHES" ]] && apply_vim_patches |
36 |
+ if [[ $VIM_ORG_PATCHES == *.patch.bz2 ]]; then |
37 |
+ einfo "Applying monolithic patch ${VIM_ORG_PATCHES}" |
38 |
+ epatch "${WORKDIR}/${VIM_ORG_PATCHES%.bz2}" |
39 |
+ else |
40 |
+ apply_vim_patches |
41 |
+ fi |
42 |
|
43 |
# Unpack the runtime snapshot if available (only for vim-core) |
44 |
if [[ -n "$VIM_RUNTIME_SNAP" ]] ; then |
45 |
@@ -273,8 +278,7 @@ |
46 |
# some reason on freebsd. |
47 |
# --spb, 2004/12/18 |
48 |
tar xjf "${DISTDIR}"/${VIM_RUNTIME_SNAP} |
49 |
- assert # this will check both parts of the pipeline; eend would not |
50 |
- eend 0 |
51 |
+ eend $? |
52 |
fi |
53 |
fi |