Signed-off-by: Michał Górny <[email protected]>
---
eclass/distutils-r2.eclass | 14 ++++----
eclass/python-any-r2.eclass | 9 +++--
...ython-r2.eclass => python-multi-r2.eclass} | 33 +++++++++----------
eclass/python-single-r2.eclass | 16 ++++-----
eclass/python-utils-r2.eclass | 8 ++---
5 files changed, 39 insertions(+), 41 deletions(-)
rename eclass/{python-r2.eclass => python-multi-r2.eclass} (96%)
diff --git a/eclass/distutils-r2.eclass b/eclass/distutils-r2.eclass
index b155c31d121e..b1bc7aadae57 100644
--- a/eclass/distutils-r2.eclass
+++ b/eclass/distutils-r2.eclass
@@ -14,7 +14,7 @@
# the src_* phases. Each of the phases runs two pseudo-phases:
# python_..._all() (e.g. python_prepare_all()) once in ${S}, then
# python_...() (e.g. python_prepare()) for each implementation
-# (see: python_foreach_impl() in python-r2).
+# (see: python_foreach_impl() in python-multi-r2).
#
# In distutils-r2_src_prepare(), the 'all' function is run before
# per-implementation ones (because it creates the implementations),
@@ -35,9 +35,9 @@
# Please note that distutils-r2 sets RDEPEND and DEPEND unconditionally
# for you.
#
-# Also, please note that distutils-r2 will always inherit python-r2
-# as well. Thus, all the variables defined and documented there are
-# relevant to the packages using distutils-r2.
+# Also, please note that distutils-r2 will always inherit
+# python-multi-r2 or python-single-r2. Thus, all the variables defined
+# and documented there are relevant to the packages using distutils-r2.
case "${EAPI:-0}" in
0|1|2|3|4)
@@ -66,8 +66,8 @@ esac
# @DEFAULT_UNSET
# @DESCRIPTION:
# If set to a non-null value, the ebuild will support setting a single
-# Python implementation only. It will effectively replace the python-r2
-# eclass inherit with python-single-r2.
+# Python implementation only. It will effectively replace
+# the python-multi-r2 eclass inherit with python-single-r2.
#
# Note that inheriting python-single-r2 will cause pkg_setup()
# to be exported. It must be run in order for the eclass functions
@@ -97,7 +97,7 @@ if [[ ! ${_DISTUTILS_R2} ]]; then
inherit multiprocessing toolchain-funcs
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
- inherit python-r2
+ inherit python-multi-r2
else
inherit python-single-r2
fi
diff --git a/eclass/python-any-r2.eclass b/eclass/python-any-r2.eclass
index 11ff29167f56..d6523a93646a 100644
--- a/eclass/python-any-r2.eclass
+++ b/eclass/python-any-r2.eclass
@@ -40,8 +40,8 @@ esac
if [[ ! ${_PYTHON_ANY_R2} ]]; then
-if [[ ${_PYTHON_R2} ]]; then
- die 'python-any-r2.eclass can not be used with python-r2.eclass.'
+if [[ ${_PYTHON_MULTI_R2} ]]; then
+ die 'python-any-r2.eclass can not be used with python-multi-r2.eclass.'
elif [[ ${_PYTHON_SINGLE_R2} ]]; then
die 'python-any-r2.eclass can not be used with python-single-r2.eclass.'
fi
@@ -124,9 +124,8 @@ EXPORT_FUNCTIONS pkg_setup
# An eclass-generated USE-dependency string for the currently tested
# implementation. It is set locally for python_check_deps() call.
#
-# The generate USE-flag list is compatible with packages using python-r2,
-# python-single-r2 and python-distutils-ng eclasses. It must not be used
-# on packages using python.eclass.
+# The generate USE-flag list is compatible with packages using
+# python-multi-r2 eclass.
#
# Example use:
# @CODE
diff --git a/eclass/python-r2.eclass b/eclass/python-multi-r2.eclass
similarity index 96%
rename from eclass/python-r2.eclass
rename to eclass/python-multi-r2.eclass
index f7a92c500317..093f794b909b 100644
--- a/eclass/python-r2.eclass
+++ b/eclass/python-multi-r2.eclass
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# @ECLASS: python-r2.eclass
+# @ECLASS: python-multi-r2.eclass
# @MAINTAINER:
# Python team <[email protected]>
# @AUTHOR:
@@ -15,15 +15,15 @@
#
# This eclass sets correct IUSE. Modification of REQUIRED_USE has to
# be done by the author of the ebuild (but PYTHON_REQUIRED_USE is
-# provided for convenience, see below). python-r2 exports PYTHON_DEPS
-# and PYTHON_USEDEP so you can create correct dependencies for your
-# package easily. It also provides methods to easily run a command for
-# each enabled Python implementation and duplicate the sources for them.
+# provided for convenience, see below). python-multi-r2 exports
+# PYTHON_DEPS and PYTHON_USEDEP so you can create correct dependencies
+# for your package easily. It also provides methods to easily run
+# a command for each enabled Python implementation and duplicate
+# the sources for them.
#
-# Please note that python-r2 will always inherit python-utils-r2 as
-# well. Thus, all the functions defined there can be used
-# in the packages using python-r2, and there is no need ever to inherit
-# both.
+# Please note that python-multi-r2 will always inherit python-utils-r2.
+# Thus, all the functions defined there can be used in the packages
+# using python-multi-r2, and there is no need ever to inherit both.
case "${EAPI:-0}" in
0|1|2|3|4)
@@ -37,12 +37,12 @@ case "${EAPI:-0}" in
;;
esac
-if [[ ! ${_PYTHON_R2} ]]; then
+if [[ ! ${_PYTHON_MULTI_R2} ]]; then
if [[ ${_PYTHON_SINGLE_R2} ]]; then
- die 'python-r2.eclass can not be used with python-single-r2.eclass.'
+ die 'python-multi-r2.eclass can not be used with
python-single-r2.eclass.'
elif [[ ${_PYTHON_ANY_R2} ]]; then
- die 'python-r2.eclass can not be used with python-any-r2.eclass.'
+ die 'python-multi-r2.eclass can not be used with python-any-r2.eclass.'
fi
[[ ${EAPI} == [45] ]] && inherit eutils
@@ -131,9 +131,8 @@ fi
# depend on another Python package being built for the same Python
# implementations.
#
-# The generate USE-flag list is compatible with packages using python-r2
-# and python-distutils-ng eclasses. It must not be used on packages
-# using python.eclass.
+# The generate USE-flag list is compatible with packages using
+# python-multi-r2.
#
# Example use:
# @CODE
@@ -230,7 +229,7 @@ _python_set_globals() {
_python_set_globals
unset -f _python_set_globals
-if [[ ! ${_PYTHON_R2} ]]; then
+if [[ ! ${_PYTHON_MULTI_R2} ]]; then
# @FUNCTION: _python_validate_useflags
# @INTERNAL
@@ -779,5 +778,5 @@ python_replicate_script() {
done
}
-_PYTHON_R2=1
+_PYTHON_MULTI_R2=1
fi
diff --git a/eclass/python-single-r2.eclass b/eclass/python-single-r2.eclass
index 2c73ec4d11fb..833622f1a49a 100644
--- a/eclass/python-single-r2.eclass
+++ b/eclass/python-single-r2.eclass
@@ -20,12 +20,12 @@
#
# The eclass exports PYTHON_SINGLE_USEDEP that is suitable for depending
# on other packages using the eclass. Dependencies on packages using
-# python-r2 should be created via python_gen_cond_dep() function,
+# python-multi-r2 should be created via python_gen_cond_dep() function,
# using PYTHON_USEDEP placeholder.
#
# Please note that packages support multiple Python implementations
-# (using python-r2 eclass) can not depend on packages not supporting
-# them (using this eclass).
+# (using python-multi-r2 eclass) can not depend on packages
+# not supporting them (using this eclass).
#
# Please note that python-single-r2 will always inherit python-utils-r2
# as well. Thus, all the functions defined there can be used
@@ -46,8 +46,8 @@ esac
if [[ ! ${_PYTHON_SINGLE_R2} ]]; then
-if [[ ${_PYTHON_R2} ]]; then
- die 'python-single-r2.eclass can not be used with python-r2.eclass.'
+if [[ ${_PYTHON_MULTI_R2} ]]; then
+ die 'python-single-r2.eclass can not be used with
python-multi-r2.eclass.'
elif [[ ${_PYTHON_ANY_R2} ]]; then
die 'python-single-r2.eclass can not be used with python-any-r2.eclass.'
fi
@@ -141,7 +141,7 @@ EXPORT_FUNCTIONS pkg_setup
# depend on another python-single-r2 package being built for the same
# Python implementations.
#
-# If you need to depend on a multi-impl (python-r2) package, use
+# If you need to depend on a multi-impl (python-multi-r2) package, use
# python_gen_cond_dep with PYTHON_USEDEP placeholder instead.
#
# Example use:
@@ -157,8 +157,8 @@ EXPORT_FUNCTIONS pkg_setup
# @ECLASS-VARIABLE: PYTHON_USEDEP
# @DESCRIPTION:
# This is a placeholder variable supported by python_gen_cond_dep,
-# in order to depend on python-r2 packages built for the same Python
-# implementations.
+# in order to depend on python-multi-r2 packages built for the same
+# Python implementations.
#
# Example use:
# @CODE
diff --git a/eclass/python-utils-r2.eclass b/eclass/python-utils-r2.eclass
index 8486ee901cd9..8d1012a40513 100644
--- a/eclass/python-utils-r2.eclass
+++ b/eclass/python-utils-r2.eclass
@@ -193,8 +193,8 @@ _python_impl_matches() {
#
# This variable is set automatically in the following contexts:
#
-# python-r2: Set in functions called by python_foreach_impl() or after
-# calling python_setup().
+# python-multi-r2: Set in functions called by python_foreach_impl()
+# or after calling python_setup().
#
# python-single-r2: Set after calling python-single-r2_pkg_setup().
#
@@ -212,8 +212,8 @@ _python_impl_matches() {
#
# This variable is set automatically in the following contexts:
#
-# python-r2: Set in functions called by python_foreach_impl() or after
-# calling python_setup().
+# python-multi-r2: Set in functions called by python_foreach_impl()
+# or after calling python_setup().
#
# python-single-r2: Set after calling python-single-r2_pkg_setup().
#
--
2.25.1
