1 |
darkside 10/04/23 19:01:37 |
2 |
|
3 |
Modified: vim-doc.eclass vim-spell.eclass |
4 |
Log: |
5 |
Add EROOT (EAPI3) support to vim-doc & vim-spell eclasses |
6 |
|
7 |
Revision Changes Path |
8 |
1.16 eclass/vim-doc.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-doc.eclass?rev=1.16&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-doc.eclass?rev=1.16&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-doc.eclass?r1=1.15&r2=1.16 |
13 |
|
14 |
Index: vim-doc.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v |
17 |
retrieving revision 1.15 |
18 |
retrieving revision 1.16 |
19 |
diff -u -r1.15 -r1.16 |
20 |
--- vim-doc.eclass 14 May 2007 20:04:07 -0000 1.15 |
21 |
+++ vim-doc.eclass 23 Apr 2010 19:01:37 -0000 1.16 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2004 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.15 2007/05/14 20:04:07 pioto Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.16 2010/04/23 19:01:37 darkside Exp $ |
27 |
# |
28 |
# This eclass is used by vim.eclass and vim-plugin.eclass to update |
29 |
# the documentation tags. This is necessary since vim doesn't look in |
30 |
@@ -13,10 +13,11 @@ |
31 |
|
32 |
|
33 |
update_vim_helptags() { |
34 |
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" |
35 |
local vimfiles vim d s |
36 |
|
37 |
# This is where vim plugins are installed |
38 |
- vimfiles="${ROOT}"/usr/share/vim/vimfiles |
39 |
+ vimfiles="${EROOT}"/usr/share/vim/vimfiles |
40 |
|
41 |
if [[ $PN != vim-core ]]; then |
42 |
# Find a suitable vim binary for updating tags :helptags |
43 |
@@ -37,7 +38,7 @@ |
44 |
|
45 |
# Install the documentation symlinks into the versioned vim |
46 |
# directory and run :helptags |
47 |
- for d in "${ROOT}"/usr/share/vim/vim[0-9]*; do |
48 |
+ for d in "${EROOT%/}"/usr/share/vim/vim[0-9]*; do |
49 |
[[ -d "$d/doc" ]] || continue # catch a failed glob |
50 |
|
51 |
# Remove links, and possibly remove stale dirs |
52 |
|
53 |
|
54 |
|
55 |
1.8 eclass/vim-spell.eclass |
56 |
|
57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-spell.eclass?rev=1.8&view=markup |
58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-spell.eclass?rev=1.8&content-type=text/plain |
59 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-spell.eclass?r1=1.7&r2=1.8 |
60 |
|
61 |
Index: vim-spell.eclass |
62 |
=================================================================== |
63 |
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v |
64 |
retrieving revision 1.7 |
65 |
retrieving revision 1.8 |
66 |
diff -u -r1.7 -r1.8 |
67 |
--- vim-spell.eclass 7 Jul 2009 18:54:05 -0000 1.7 |
68 |
+++ vim-spell.eclass 23 Apr 2010 19:01:37 -0000 1.8 |
69 |
@@ -1,6 +1,6 @@ |
70 |
# Copyright 1999-2005 Gentoo Foundation |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.7 2009/07/07 18:54:05 arfrever Exp $ |
73 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.8 2010/04/23 19:01:37 darkside Exp $ |
74 |
|
75 |
# |
76 |
# Original Author: Ciaran McCreesh <ciaranm@g.o> |
77 |
@@ -105,6 +105,7 @@ |
78 |
} |
79 |
|
80 |
vim-spell_pkg_postinst() { |
81 |
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" |
82 |
target="/usr/share/vim/vimfiles/spell/" |
83 |
echo |
84 |
elog "To enable ${VIM_SPELL_LANGUAGE} spell checking, use" |
85 |
@@ -112,7 +113,7 @@ |
86 |
echo |
87 |
elog "The following (Vim internal, not file) encodings are supported for" |
88 |
elog "this language:" |
89 |
- for f in "${ROOT}/${target}/${VIM_SPELL_CODE}".*.spl ; do |
90 |
+ for f in "${EROOT}/${target}/${VIM_SPELL_CODE}".*.spl ; do |
91 |
enc="${f##*/${VIM_SPELL_CODE}.}" |
92 |
enc="${enc%.spl}" |
93 |
[[ -z "${enc}" ]] && continue |