[gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/

[Michał Górny]

commit:     a4de8aa2e9ef28100fb8834aaeb4495f66efb8d9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  1 12:52:26 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 05:14:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4de8aa2

scons-utils.eclass: scons_clean_makeopts, mark internal

 eclass/scons-utils.eclass   | 7 ++++---
 eclass/tests/scons-utils.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index b8051b0..e5e309b 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -124,7 +124,7 @@ escons() {
        fi
 
        # if SCONSOPTS are _unset_, use cleaned MAKEOPTS
-       set -- scons ${SCONSOPTS-$(scons_clean_makeopts)} ${EXTRA_ESCONS} \
+       set -- scons ${SCONSOPTS-$(_scons_clean_makeopts)} ${EXTRA_ESCONS} \
                "${@}"
        echo "${@}" >&2
        "${@}"
@@ -145,14 +145,15 @@ escons() {
        return ${ret}
 }
 
-# @FUNCTION: scons_clean_makeopts
+# @FUNCTION: _scons_clean_makeopts
+# @INTERNAL
 # @USAGE: [makeflags] [...]
 # @DESCRIPTION:
 # Strip the supplied makeflags (or ${MAKEOPTS} if called without
 # an argument) of options not supported by SCons and make sure --jobs
 # gets an argument. Output the resulting flag list (suitable
 # for an assignment to SCONSOPTS).
-scons_clean_makeopts() {
+_scons_clean_makeopts() {
        local new_makeopts
 
        debug-print-function ${FUNCNAME} "${@}"

diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh
index 7387135..df8af7a 100755
--- a/eclass/tests/scons-utils.sh
+++ b/eclass/tests/scons-utils.sh
@@ -10,7 +10,7 @@ inherit scons-utils
 test-scons_clean_makeopts() {
        tbegin "scons_clean_makeopts() for ${1}"
 
-       local sconsopts=$(scons_clean_makeopts ${1}) ret=0
+       local sconsopts=$(_scons_clean_makeopts ${1}) ret=0
 
        if [[ ${sconsopts} != ${2-${1}} ]]; then
                eerror "Self-test failed:"