[gentoo-commits] gentoo-x86 commit in eclass: vim.eclass bash-completion.eclass

[gentoo-commits] gentoo-x86 commit in eclass: vim.eclass bash-completion.eclass

[Jeremy Olexa (darkside)]

darkside    10/04/07 04:20:46

  Modified:             vim.eclass bash-completion.eclass
  Log:
  Due to portage's environment filtering, variables that start with BASH_ cannot be used. As such, s/BASH_COMPLETION_NAME/BASHCOMPLETION_NAME/g for bug 312671

Revision  Changes    Path
1.184                eclass/vim.eclass

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

Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- vim.eclass	28 Mar 2010 02:23:19 -0000	1.183
+++ vim.eclass	7 Apr 2010 04:20:46 -0000	1.184
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.183 2010/03/28 02:23:19 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.184 2010/04/07 04:20:46 darkside Exp $
 
 # Authors:
 # 	Jim Ramsay <i.am@gentoo.org>
@@ -692,7 +692,7 @@
 
 	# Display bash-completion message
 	if [[ ${MY_PN} == "vim-core" ]] ; then
-		export BASH_COMPLETION_NAME="xxd"
+		export BASHCOMPLETION_NAME="xxd"
 	fi
 	bash-completion_pkg_postinst
 



1.24                 eclass/bash-completion.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.23&r2=1.24

Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bash-completion.eclass	2 Jan 2010 00:07:46 -0000	1.23
+++ bash-completion.eclass	7 Apr 2010 04:20:46 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.23 2010/01/02 00:07:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.24 2010/04/07 04:20:46 darkside Exp $
 
 # @ECLASS: bash-completion.eclass
 # @MAINTAINER:
@@ -13,7 +13,7 @@
 # contributed (ie not included in bash-completion proper)
 # bash-completion scripts.
 
-# @ECLASS-VARIABLE: BASH_COMPLETION_NAME
+# @ECLASS-VARIABLE: BASHCOMPLETION_NAME
 # @DESCRIPTION:
 # Install the completion script with this name (see also dobashcompletion)
 
@@ -31,19 +31,19 @@
 # @USAGE: < file > [ new_file ]
 # @DESCRIPTION:
 # First arg, <file>, is required and is the location of the bash-completion
-# script to install.  If the variable BASH_COMPLETION_NAME is set in the
+# script to install.  If the variable BASHCOMPLETION_NAME is set in the
 # ebuild, dobashcompletion will install <file> as
-# /usr/share/bash-completion/$BASH_COMPLETION_NAME. If it is not set,
+# /usr/share/bash-completion/$BASHCOMPLETION_NAME. If it is not set,
 # dobashcompletion will check if a second arg [new_file] was passed, installing as
 # the specified name.  Failing both these checks, dobashcompletion will
 # install the file as /usr/share/bash-completion/${PN}.
 dobashcompletion() {
 	[[ -z "$1" ]] && die "usage: dobashcompletion <file> <new file>"
-	[[ -z "${BASH_COMPLETION_NAME}" ]] && BASH_COMPLETION_NAME="${2:-${PN}}"
+	[[ -z "${BASHCOMPLETION_NAME}" ]] && BASHCOMPLETION_NAME="${2:-${PN}}"
 
 	if use bash-completion ; then
 		insinto /usr/share/bash-completion
-		newins "$1" "${BASH_COMPLETION_NAME}" || die "Failed to install $1"
+		newins "$1" "${BASHCOMPLETION_NAME}" || die "Failed to install $1"
 	fi
 }
 
@@ -55,11 +55,11 @@
 		elog "In the case that you haven't yet enabled command-line completion"
 		elog "for ${PN}, you can run:"
 		elog
-		elog "  eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
+		elog "  eselect bashcomp enable ${BASHCOMPLETION_NAME:-${PN}}"
 		elog
 		elog "to install locally, or"
 		elog
-		elog "  eselect bashcomp enable --global ${BASH_COMPLETION_NAME:-${PN}}"
+		elog "  eselect bashcomp enable --global ${BASHCOMPLETION_NAME:-${PN}}"
 		elog
 		elog "to install system-wide."
 	fi