python-utils-r1.eclass: Mark python_export private

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index d16677debd2a683029b497afe528008a4c1cdb0d..eef4c57b7e25c326bc458a4378e1cb8792b58cc0 100644 (file)
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -151,7 +151,7 @@ _python_any_set_globals() {
        _python_set_impls
 
        for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-               python_export "${i}" PYTHON_PKG_DEP
+               _python_export "${i}" PYTHON_PKG_DEP
 
                # note: need to strip '=' slot operator for || deps
                deps="${PYTHON_PKG_DEP/:0=/:0} ${deps}"
@@ -232,7 +232,7 @@ python_gen_any_dep() {
        local i PYTHON_PKG_DEP out=
        for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
                local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)"
-               python_export "${i}" PYTHON_PKG_DEP
+               _python_export "${i}" PYTHON_PKG_DEP
 
                local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
                # note: need to strip '=' slot operator for || deps
@@ -299,7 +299,7 @@ python_setup() {
                ewarn
                ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored."
 
-               python_export "${impls[0]}" EPYTHON PYTHON
+               _python_export "${impls[0]}" EPYTHON PYTHON
                _python_wrapper_setup
                einfo "Using ${EPYTHON} to build"
                return
@@ -308,7 +308,7 @@ python_setup() {
        # first, try ${EPYTHON}... maybe it's good enough for us.
        if [[ ${EPYTHON} ]]; then
                if _python_EPYTHON_supported "${EPYTHON}"; then
-                       python_export EPYTHON PYTHON
+                       _python_export EPYTHON PYTHON
                        _python_wrapper_setup
                        einfo "Using ${EPYTHON} to build"
                        return
@@ -324,7 +324,7 @@ python_setup() {
                        # no eselect-python?
                        break
                elif _python_EPYTHON_supported "${i}"; then
-                       python_export "${i}" EPYTHON PYTHON
+                       _python_export "${i}" EPYTHON PYTHON
                        _python_wrapper_setup
                        einfo "Using ${EPYTHON} to build"
                        return
@@ -334,7 +334,7 @@ python_setup() {
        # fallback to best installed impl.
        # (reverse iteration over _PYTHON_SUPPORTED_IMPLS)
        for (( i = ${#_PYTHON_SUPPORTED_IMPLS[@]} - 1; i >= 0; i-- )); do
-               python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON
+               _python_export "${_PYTHON_SUPPORTED_IMPLS[i]}" EPYTHON PYTHON
                if _python_EPYTHON_supported "${EPYTHON}"; then
                        _python_wrapper_setup
                        einfo "Using ${EPYTHON} to build"

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 3ac35e401217c4ba893b6b1740e06f076b4911ef..8687b595123a5bffca598ced103b5d2c07a9857d 100644 (file)
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -173,7 +173,7 @@ _python_set_globals() {
        _python_set_impls
 
        for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-               python_export "${i}" PYTHON_PKG_DEP
+               _python_export "${i}" PYTHON_PKG_DEP
                deps+="python_targets_${i}? ( ${PYTHON_PKG_DEP} ) "
        done
 
@@ -485,7 +485,7 @@ python_gen_impl_dep() {
        for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
                if _python_impl_matches "${impl}" "${@}"; then
                        local PYTHON_PKG_DEP
-                       python_export "${impl}" PYTHON_PKG_DEP
+                       _python_export "${impl}" PYTHON_PKG_DEP
                        matches+=( "python_targets_${impl}? ( ${PYTHON_PKG_DEP} )" )
                fi
        done
@@ -563,7 +563,7 @@ python_gen_any_dep() {
        for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
                if _python_impl_matches "${i}" "${@}"; then
                        local PYTHON_USEDEP="python_targets_${i}(-),python_single_target_${i}(+)"
-                       python_export "${i}" PYTHON_PKG_DEP
+                       _python_export "${i}" PYTHON_PKG_DEP
 
                        local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
                        # note: need to strip '=' slot operator for || deps
@@ -637,7 +637,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_export "${MULTIBUILD_VARIANT}" EPYTHON PYTHON
        _python_wrapper_setup
 
        "${@}"
@@ -760,7 +760,7 @@ python_setup() {
                # check patterns
                _python_impl_matches "${impl}" "${@}" || continue
 
-               python_export "${impl}" EPYTHON PYTHON
+               _python_export "${impl}" EPYTHON PYTHON
 
                # if python_check_deps() is declared, switch into any-of mode
                if [[ ${has_check_deps} ]]; then
@@ -803,7 +803,7 @@ python_replicate_script() {
                local _PYTHON_FIX_SHEBANG_QUIET=1
 
                local PYTHON_SCRIPTDIR
-               python_export PYTHON_SCRIPTDIR
+               _python_export PYTHON_SCRIPTDIR
 
                (
                        exeopts -m 0755

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 888db3631d9cb3da64aa35260eafe20fc83156ba..ab3df94dcf111d8765b907addcb62cc8a15ce706 100644 (file)
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -213,7 +213,7 @@ _python_single_set_globals() {
 
        local deps= i PYTHON_PKG_DEP
        for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-               python_export "${i}" PYTHON_PKG_DEP
+               _python_export "${i}" PYTHON_PKG_DEP
                # 1) well, python-exec would suffice as an RDEP
                # but no point in making this overcomplex, BDEP doesn't hurt anyone
                # 2) python-exec should be built with all targets forced anyway
@@ -436,7 +436,7 @@ python_gen_impl_dep() {
        for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
                if _python_impl_matches "${impl}" "${@}"; then
                        local PYTHON_PKG_DEP
-                       python_export "${impl}" PYTHON_PKG_DEP
+                       _python_export "${impl}" PYTHON_PKG_DEP
                        matches+=( "python_single_target_${impl}? ( ${PYTHON_PKG_DEP} )" )
                fi
        done
@@ -465,7 +465,7 @@ python_setup() {
                ewarn
                ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags will be ignored."
 
-               python_export "${impls[0]}" EPYTHON PYTHON
+               _python_export "${impls[0]}" EPYTHON PYTHON
                _python_wrapper_setup
                einfo "Using ${EPYTHON} to build"
                return
@@ -483,7 +483,7 @@ python_setup() {
                                die "More than one implementation in PYTHON_SINGLE_TARGET."
                        fi
 
-                       python_export "${impl}" EPYTHON PYTHON
+                       _python_export "${impl}" EPYTHON PYTHON
                        _python_wrapper_setup
                        einfo "Using ${EPYTHON} to build"
                fi

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 064114b4faa3ea752461921485f90743c98f4823..aacee5ac35a013efd84ff4f929af4a484395733c 100644 (file)
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -228,116 +228,24 @@ _python_impl_matches() {
 # python2.7
 # @CODE
 
-# @ECLASS-VARIABLE: PYTHON_SITEDIR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The path to Python site-packages directory.
-#
-# Set and exported on request using python_export().
-# Requires a proper build-time dependency on the Python implementation.
-#
-# Example value:
-# @CODE
-# /usr/lib64/python2.7/site-packages
-# @CODE
-
-# @ECLASS-VARIABLE: PYTHON_INCLUDEDIR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The path to Python include directory.
-#
-# Set and exported on request using python_export().
-# Requires a proper build-time dependency on the Python implementation.
-#
-# Example value:
-# @CODE
-# /usr/include/python2.7
-# @CODE
-
-# @ECLASS-VARIABLE: PYTHON_LIBPATH
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The path to Python library.
-#
-# Set and exported on request using python_export().
-# Valid only for CPython. Requires a proper build-time dependency
-# on the Python implementation.
-#
-# Example value:
-# @CODE
-# /usr/lib64/libpython2.7.so
-# @CODE
-
-# @ECLASS-VARIABLE: PYTHON_CFLAGS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Proper C compiler flags for building against Python. Obtained from
-# pkg-config or python-config.
-#
-# Set and exported on request using python_export().
-# Valid only for CPython. Requires a proper build-time dependency
-# on the Python implementation and on pkg-config.
-#
-# Example value:
-# @CODE
-# -I/usr/include/python2.7
-# @CODE
-
-# @ECLASS-VARIABLE: PYTHON_LIBS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Proper C compiler flags for linking against Python. Obtained from
-# pkg-config or python-config.
-#
-# Set and exported on request using python_export().
-# Valid only for CPython. Requires a proper build-time dependency
-# on the Python implementation and on pkg-config.
-#
-# Example value:
-# @CODE
-# -lpython2.7
-# @CODE
-
-# @ECLASS-VARIABLE: PYTHON_CONFIG
-# @DEFAULT_UNSET
+# @FUNCTION: python_export
+# @USAGE: [<impl>] <variables>...
+# @INTERNAL
 # @DESCRIPTION:
-# Path to the python-config executable.
-#
-# Set and exported on request using python_export().
-# Valid only for CPython. Requires a proper build-time dependency
-# on the Python implementation and on pkg-config.
-#
-# Example value:
-# @CODE
-# /usr/bin/python2.7-config
-# @CODE
+# Backwards compatibility function.  The relevant API is now considered
+# private, please use python_get* instead.
+python_export() {
+       debug-print-function ${FUNCNAME} "${@}"
 
-# @ECLASS-VARIABLE: PYTHON_PKG_DEP
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The complete dependency on a particular Python package as a string.
-#
-# Set and exported on request using python_export().
-#
-# Example value:
-# @CODE
-# dev-lang/python:2.7[xml]
-# @CODE
+       eqawarn "python_export() is part of private eclass API."
+       eqawarn "Please call python_get*() instead."
 
-# @ECLASS-VARIABLE: PYTHON_SCRIPTDIR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The location where Python scripts must be installed for current impl.
-#
-# Set and exported on request using python_export().
-#
-# Example value:
-# @CODE
-# /usr/lib/python-exec/python2.7
-# @CODE
+       _python_export "${@}"
+}
 
-# @FUNCTION: python_export
+# @FUNCTION: _python_export
 # @USAGE: [<impl>] <variables>...
+# @INTERNAL
 # @DESCRIPTION:
 # Set and export the Python implementation-relevant variables passed
 # as parameters.
@@ -350,7 +258,7 @@ _python_impl_matches() {
 # The variables which can be exported are: PYTHON, EPYTHON,
 # PYTHON_SITEDIR. They are described more completely in the eclass
 # variable documentation.
-python_export() {
+_python_export() {
        debug-print-function ${FUNCNAME} "${@}"
 
        local impl var
@@ -367,7 +275,7 @@ python_export() {
                *)
                        impl=${EPYTHON}
                        if [[ -z ${impl} ]]; then
-                               die "python_export called without a python implementation and EPYTHON is unset"
+                               die "_python_export called without a python implementation and EPYTHON is unset"
                        fi
                        ;;
        esac
@@ -495,7 +403,7 @@ python_export() {
                                debug-print "${FUNCNAME}: PYTHON_SCRIPTDIR = ${PYTHON_SCRIPTDIR}"
                                ;;
                        *)
-                               die "python_export: unknown variable ${var}"
+                               die "_python_export: unknown variable ${var}"
                esac
        done
 }
@@ -506,13 +414,10 @@ python_export() {
 # Obtain and print the 'site-packages' path for the given
 # implementation. If no implementation is provided, ${EPYTHON} will
 # be used.
-#
-# If you just need to have PYTHON_SITEDIR set (and exported), then it is
-# better to use python_export() directly instead.
 python_get_sitedir() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_SITEDIR
+       _python_export "${@}" PYTHON_SITEDIR
        echo "${PYTHON_SITEDIR}"
 }
 
@@ -521,13 +426,10 @@ python_get_sitedir() {
 # @DESCRIPTION:
 # Obtain and print the include path for the given implementation. If no
 # implementation is provided, ${EPYTHON} will be used.
-#
-# If you just need to have PYTHON_INCLUDEDIR set (and exported), then it
-# is better to use python_export() directly instead.
 python_get_includedir() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_INCLUDEDIR
+       _python_export "${@}" PYTHON_INCLUDEDIR
        echo "${PYTHON_INCLUDEDIR}"
 }
 
@@ -542,7 +444,7 @@ python_get_includedir() {
 python_get_library_path() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_LIBPATH
+       _python_export "${@}" PYTHON_LIBPATH
        echo "${PYTHON_LIBPATH}"
 }
 
@@ -559,7 +461,7 @@ python_get_library_path() {
 python_get_CFLAGS() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_CFLAGS
+       _python_export "${@}" PYTHON_CFLAGS
        echo "${PYTHON_CFLAGS}"
 }
 
@@ -576,7 +478,7 @@ python_get_CFLAGS() {
 python_get_LIBS() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_LIBS
+       _python_export "${@}" PYTHON_LIBS
        echo "${PYTHON_LIBS}"
 }
 
@@ -593,7 +495,7 @@ python_get_LIBS() {
 python_get_PYTHON_CONFIG() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_CONFIG
+       _python_export "${@}" PYTHON_CONFIG
        echo "${PYTHON_CONFIG}"
 }
 
@@ -606,7 +508,7 @@ python_get_PYTHON_CONFIG() {
 python_get_scriptdir() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       python_export "${@}" PYTHON_SCRIPTDIR
+       _python_export "${@}" PYTHON_SCRIPTDIR
        echo "${PYTHON_SCRIPTDIR}"
 }
 
@@ -671,7 +573,7 @@ python_optimize() {
        [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 
        local PYTHON=${PYTHON}
-       [[ ${PYTHON} ]] || python_export PYTHON
+       [[ ${PYTHON} ]] || _python_export PYTHON
 
        # default to sys.path
        if [[ ${#} -eq 0 ]]; then
@@ -991,7 +893,7 @@ _python_wrapper_setup() {
                rm -f "${workdir}"/pkgconfig/python{2,3}{,-embed}.pc || die
 
                local EPYTHON PYTHON
-               python_export "${impl}" EPYTHON PYTHON
+               _python_export "${impl}" EPYTHON PYTHON
 
                local pyver pyother
                if python_is_python3; then
@@ -1101,7 +1003,7 @@ python_is_installed() {
        esac
 
        local PYTHON_PKG_DEP
-       python_export "${impl}" PYTHON_PKG_DEP
+       _python_export "${impl}" PYTHON_PKG_DEP
        has_version "${hasv_args[@]}" "${PYTHON_PKG_DEP}"
 }
 

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 4367890a08a11f5adb74f443b271fb466bfb1cad..2ce425be15e6033b5badc5e521ed0926d8d189b5 100755 (executable)
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -13,7 +13,7 @@ test_var() {
        tbegin "${var} for ${impl}"
 
        local ${var}
-       python_export ${impl} PYTHON ${var}
+       _python_export ${impl} PYTHON ${var}
        [[ ${!var} == ${expect} ]] || eerror "(${impl}: ${var}: ${!var} != ${expect}"
 
        tend ${?}

diff --git a/metadata/install-qa-check.d/60python-pyc b/metadata/install-qa-check.d/60python-pyc
index 644c27243cd219bcf46062012065a6e78d5fbedc..b2af142fc491a769fbbd5d7b929c29e1c3e41ab4 100644 (file)
--- a/metadata/install-qa-check.d/60python-pyc
+++ b/metadata/install-qa-check.d/60python-pyc
@@ -10,7 +10,7 @@ if [[ ${EAPI} == [5-7] ]]; then
        python_pyc_check() {
                local impl missing=() outdated=()
                for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-                       python_export "${impl}" EPYTHON PYTHON
+                       _python_export "${impl}" EPYTHON PYTHON
                        [[ -x ${PYTHON} ]] || continue
                        local sitedir=$(python_get_sitedir "${impl}")