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-single-r1.eclass | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'eclass/python-single-r1.eclass')
| -rw-r--r-- | eclass/python-single-r1.eclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 739a394ddd18..ab3df94dcf11 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -33,8 +33,8 @@ # in the packages using python-single-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-single-r1 +# For more information, please see the Python Guide: +# https://dev.gentoo.org/~mgorny/python-guide/ case "${EAPI:-0}" in 0|1|2|3|4) @@ -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,8 +465,9 @@ python_setup() { ewarn ewarn "Dependencies won't be satisfied, and PYTHON_SINGLE_TARGET flags 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 @@ -482,8 +483,9 @@ python_setup() { die "More than one implementation in PYTHON_SINGLE_TARGET." fi - python_export "${impl}" EPYTHON PYTHON - python_wrapper_setup + _python_export "${impl}" EPYTHON PYTHON + _python_wrapper_setup + einfo "Using ${EPYTHON} to build" fi done |