Remove global BASH_COMPLETION_NAME var

diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass
index a7ab5914bb81aeda543587a2031bdd68fafadfbb..84af38b8a6d0f4e40fcf3921ac3647fffd72d11d 100644 (file)
--- a/eclass/bash-completion.eclass
+++ b/eclass/bash-completion.eclass
@@ -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/bash-completion.eclass,v 1.6 2004/12/29 10:26:33 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.7 2004/12/30 00:18:25 ka0ttic Exp $
 #
 # Simple eclass that provides an interface for installing
 # contributed (ie not included in bash-completion proper)
@@ -19,9 +19,6 @@ IUSE="${IUSE} bash-completion"
 #RDEPEND="${RDEPEND}
 #      bash-completion? ( app-shells/bash-completion-config )"
 
-##### VARIABLES #####
-[[ -z "${BASH_COMPLETION_NAME}" ]] && BASH_COMPLETION_NAME="${PN}"
-
 # dobashcompletion <file> <new file>
 #      First arg, <file>, is required and is the location of the bash-completion
 # script to install.  Second arg, <new file>, is optional and specifies an
@@ -29,7 +26,8 @@ IUSE="${IUSE} bash-completion"
 
 dobashcompletion() {
        [[ -z "$1" ]] && die "usage: dobashcompletion <file> <new file>"
-       [[ -n "$2" ]] && export BASH_COMPLETION_NAME="$2"
+       [[ -z "${BASH_COMPLETION_NAME}" ]] && BASH_COMPLETION_NAME="${2:-${PN}}"
+
        if useq bash-completion ; then
                insinto /usr/share/bash-completion
                newins "$1" "${BASH_COMPLETION_NAME}" || die "Failed to install $1"