diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-07-22 11:28:42 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-07-22 11:28:42 +0000 |
| commit | ae7656b838d76acfaad61db9d7cad5fd3720ddc6 (patch) | |
| tree | e1199aeb1e91f143da521be7aa0d963aae99998f | |
| parent | Backport fix for bug 451454 (diff) | |
| download | gentoo-2-ae7656b838d76acfaad61db9d7cad5fd3720ddc6.tar.gz gentoo-2-ae7656b838d76acfaad61db9d7cad5fd3720ddc6.tar.bz2 gentoo-2-ae7656b838d76acfaad61db9d7cad5fd3720ddc6.zip | |
Remove use of EPREFIX wrt #477692 to avoid collision with Portage helpers
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/bash-completion-r1.eclass | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 826d301bcc07..8b7ad8a426db 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.886 2013/07/21 19:00:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.887 2013/07/22 11:28:42 ssuominen Exp $ + + 22 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> + bash-completion-r1.eclass: + Remove use of EPREFIX wrt #477692 to avoid collision with Portage helpers 21 Jul 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass: Replace local+export with "local -x". diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass index bd254584fa9f..cde3efdeb48c 100644 --- a/eclass/bash-completion-r1.eclass +++ b/eclass/bash-completion-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.5 2013/07/15 23:54:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.6 2013/07/22 11:28:42 ssuominen Exp $ # @ECLASS: bash-completion-r1.eclass # @MAINTAINER: @@ -14,13 +14,13 @@ # src_configure() { # econf \ # --with-bash-completion-dir="$(get_bashcompdir)" -# } +# } # # src_install() { # default # # newbashcomp contrib/${PN}.bash-completion ${PN} -# } +# } # @CODE inherit toolchain-funcs @@ -66,9 +66,9 @@ _bash-completion-r1_get_bashcompdir() { # @DESCRIPTION: # Get unprefixed bash-completion helpers directory. _bash-completion-r1_get_bashhelpersdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "${@}" - _bash-completion-r1_get_bashdir helpersdir /usr/share/bash-completion/helpers + _bash-completion-r1_get_bashdir helpersdir /usr/share/bash-completion/helpers } # @FUNCTION: get_bashcompdir @@ -77,7 +77,7 @@ _bash-completion-r1_get_bashhelpersdir() { get_bashcompdir() { debug-print-function ${FUNCNAME} "${@}" - echo "${EPREFIX}$(_bash-completion-r1_get_bashcompdir)" + echo "$(_bash-completion-r1_get_bashcompdir)" } # @FUNCTION: get_bashhelpersdir @@ -87,7 +87,7 @@ get_bashcompdir() { get_bashhelpersdir() { debug-print-function ${FUNCNAME} "${@}" - echo "${EPREFIX}$(_bash-completion-r1_get_bashhelpersdir)" + echo "$(_bash-completion-r1_get_bashhelpersdir)" } # @FUNCTION: dobashcomp |