[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH 08/25] python-utils-r2.eclass: Mark python_wrapper_setup private
From:       Michał Górny <mgorny () gentoo ! org>
Date:       2020-02-29 20:41:44
Message-ID: 20200229204201.99290-9-mgorny () gentoo ! org
[Download RAW message or body]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/python-any-r2.eclass    | 8 ++++----
 eclass/python-r2.eclass        | 4 ++--
 eclass/python-single-r2.eclass | 4 ++--
 eclass/python-utils-r2.eclass  | 5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/eclass/python-any-r2.eclass b/eclass/python-any-r2.eclass
index cf70f23f69d5..05e614ca4899 100644
--- a/eclass/python-any-r2.eclass
+++ b/eclass/python-any-r2.eclass
@@ -296,7 +296,7 @@ python_setup() {
 		ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored."
 
 		python_export "${impls[0]}" EPYTHON PYTHON
-		python_wrapper_setup
+		_python_wrapper_setup
 		return
 	fi
 
@@ -304,7 +304,7 @@ python_setup() {
 	if [[ ${EPYTHON} ]]; then
 		if _python_EPYTHON_supported "${EPYTHON}"; then
 			python_export EPYTHON PYTHON
-			python_wrapper_setup
+			_python_wrapper_setup
 			return
 		fi
 	fi
@@ -319,7 +319,7 @@ python_setup() {
 			break
 		elif _python_EPYTHON_supported "${i}"; then
 			python_export "${i}" EPYTHON PYTHON
-			python_wrapper_setup
+			_python_wrapper_setup
 			return
 		fi
 	done
@@ -329,7 +329,7 @@ python_setup() {
 	for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do
 		python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON
 		if _python_EPYTHON_supported "${EPYTHON}"; then
-			python_wrapper_setup
+			_python_wrapper_setup
 			return
 		fi
 	done
diff --git a/eclass/python-r2.eclass b/eclass/python-r2.eclass
index 1ebc424bc9b3..feb8229eb2c5 100644
--- a/eclass/python-r2.eclass
+++ b/eclass/python-r2.eclass
@@ -593,7 +593,7 @@ _python_multibuild_wrapper() {
 	local -x EPYTHON PYTHON
 	local -x PATH=${PATH} PKG_CONFIG_PATH=${PKG_CONFIG_PATH}
 	python_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON
-	python_wrapper_setup
+	_python_wrapper_setup
 
 	"${@}"
 }
@@ -739,7 +739,7 @@ python_setup() {
 		die "${FUNCNAME}: no enabled implementation satisfy requirements"
 	fi
 
-	python_wrapper_setup
+	_python_wrapper_setup
 }
 
 # @FUNCTION: python_replicate_script
diff --git a/eclass/python-single-r2.eclass b/eclass/python-single-r2.eclass
index 5bf6ea7221bc..fdb3438f0531 100644
--- a/eclass/python-single-r2.eclass
+++ b/eclass/python-single-r2.eclass
@@ -462,7 +462,7 @@ python_setup() {
 		ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags will be ignored."
 
 		python_export "${impls[0]}" EPYTHON PYTHON
-		python_wrapper_setup
+		_python_wrapper_setup
 		return
 	fi
 
@@ -479,7 +479,7 @@ python_setup() {
 			fi
 
 			python_export "${impl}" EPYTHON PYTHON
-			python_wrapper_setup
+			_python_wrapper_setup
 		fi
 	done
 
diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass
index 1f904d035050..f0d8f366c050 100644
--- a/eclass/python-utils-r2.eclass
+++ b/eclass/python-utils-r2.eclass
@@ -943,8 +943,9 @@ python_doheader() {
 	)
 }
 
-# @FUNCTION: python_wrapper_setup
+# @FUNCTION: _python_wrapper_setup
 # @USAGE: [<path> [<impl>]]
+# @INTERNAL
 # @DESCRIPTION:
 # Create proper 'python' executable and pkg-config wrappers
 # (if available) in the directory named by <path>. Set up PATH
@@ -957,7 +958,7 @@ python_doheader() {
 # be assumed to contain proper wrappers already and only environment
 # setup will be done. If wrapper update is requested, the directory
 # shall be removed first.
-python_wrapper_setup() {
+_python_wrapper_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	local workdir=${1:-${T}/${EPYTHON}}
-- 
2.25.1


[prev in list] [next in list] [prev in thread] [next in thread]