diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /eclass/python-any-r1.eclass | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'eclass/python-any-r1.eclass')
| -rw-r--r-- | eclass/python-any-r1.eclass | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 878e337ff3c2..eef4c57b7e25 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-any-r1.eclass @@ -33,8 +33,8 @@ # packages using python-any-r1, and there is no need ever to inherit # both. # -# For more information, please see the wiki: -# https://wiki.gentoo.org/wiki/Project:Python/python-any-r1 +# For more information, please see the Python Guide: +# https://dev.gentoo.org/~mgorny/python-guide/ case "${EAPI:-0}" in [0-4]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${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,16 +299,18 @@ python_setup() { ewarn ewarn "Dependencies won't be satisfied, and EPYTHON/eselect-python will be ignored." - python_export "${impls[0]}" EPYTHON PYTHON - python_wrapper_setup + _python_export "${impls[0]}" EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi # first, try ${EPYTHON}... maybe it's good enough for us. if [[ ${EPYTHON} ]]; then if _python_EPYTHON_supported "${EPYTHON}"; then - python_export EPYTHON PYTHON - python_wrapper_setup + _python_export EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi fi @@ -322,8 +324,9 @@ python_setup() { # no eselect-python? break elif _python_EPYTHON_supported "${i}"; then - python_export "${i}" EPYTHON PYTHON - python_wrapper_setup + _python_export "${i}" EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi done @@ -331,9 +334,10 @@ 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 + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" return fi done |