[gentoo-commits] gentoo-x86 commit in eclass: vim-doc.eclass vim-spell.eclass

[gentoo-commits] gentoo-x86 commit in eclass: vim-doc.eclass vim-spell.eclass

[Jeremy Olexa (darkside)]

darkside    10/04/23 19:01:37

  Modified:             vim-doc.eclass vim-spell.eclass
  Log:
  Add EROOT (EAPI3) support to vim-doc & vim-spell eclasses

Revision  Changes    Path
1.16                 eclass/vim-doc.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-doc.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-doc.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-doc.eclass?r1=1.15&r2=1.16

Index: vim-doc.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vim-doc.eclass	14 May 2007 20:04:07 -0000	1.15
+++ vim-doc.eclass	23 Apr 2010 19:01:37 -0000	1.16
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.15 2007/05/14 20:04:07 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-doc.eclass,v 1.16 2010/04/23 19:01:37 darkside Exp $
 #
 # This eclass is used by vim.eclass and vim-plugin.eclass to update
 # the documentation tags.  This is necessary since vim doesn't look in
@@ -13,10 +13,11 @@
 
 
 update_vim_helptags() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
 	local vimfiles vim d s
 
 	# This is where vim plugins are installed
-	vimfiles="${ROOT}"/usr/share/vim/vimfiles
+	vimfiles="${EROOT}"/usr/share/vim/vimfiles
 
 	if [[ $PN != vim-core ]]; then
 		# Find a suitable vim binary for updating tags :helptags
@@ -37,7 +38,7 @@
 
 	# Install the documentation symlinks into the versioned vim
 	# directory and run :helptags
-	for d in "${ROOT}"/usr/share/vim/vim[0-9]*; do
+	for d in "${EROOT%/}"/usr/share/vim/vim[0-9]*; do
 		[[ -d "$d/doc" ]] || continue	# catch a failed glob
 
 		# Remove links, and possibly remove stale dirs



1.8                  eclass/vim-spell.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-spell.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-spell.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/vim-spell.eclass?r1=1.7&r2=1.8

Index: vim-spell.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vim-spell.eclass	7 Jul 2009 18:54:05 -0000	1.7
+++ vim-spell.eclass	23 Apr 2010 19:01:37 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.7 2009/07/07 18:54:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-spell.eclass,v 1.8 2010/04/23 19:01:37 darkside Exp $
 
 #
 # Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
@@ -105,6 +105,7 @@
 }
 
 vim-spell_pkg_postinst() {
+	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
 	target="/usr/share/vim/vimfiles/spell/"
 	echo
 	elog "To enable ${VIM_SPELL_LANGUAGE} spell checking, use"
@@ -112,7 +113,7 @@
 	echo
 	elog "The following (Vim internal, not file) encodings are supported for"
 	elog "this language:"
-	for f in "${ROOT}/${target}/${VIM_SPELL_CODE}".*.spl ; do
+	for f in "${EROOT}/${target}/${VIM_SPELL_CODE}".*.spl ; do
 		enc="${f##*/${VIM_SPELL_CODE}.}"
 		enc="${enc%.spl}"
 		[[ -z "${enc}" ]] && continue