diff options
author | David Seifert <soap@gentoo.org> | 2022-12-27 17:30:05 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2022-12-27 17:30:05 +0100 |
commit | d58e66fb6099252d90e7a0798a2766a9d1b555f9 (patch) | |
tree | c1e54b3f7e972b109ca02f19726671041c79a8ce | |
parent | postgres-multi.eclass: drop EAPI 5, 6 support (diff) | |
download | gentoo-d58e66fb6099252d90e7a0798a2766a9d1b555f9.tar.gz gentoo-d58e66fb6099252d90e7a0798a2766a9d1b555f9.tar.bz2 gentoo-d58e66fb6099252d90e7a0798a2766a9d1b555f9.zip |
python-any-r1.eclass: drop EAPI 6 support
Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r-- | eclass/docs.eclass | 2 | ||||
-rw-r--r-- | eclass/python-any-r1.eclass | 21 | ||||
-rw-r--r-- | eclass/python-r1.eclass | 2 | ||||
-rw-r--r-- | eclass/python-single-r1.eclass | 2 | ||||
-rw-r--r-- | eclass/scons-utils.eclass | 4 | ||||
-rw-r--r-- | eclass/waf-utils.eclass | 4 |
6 files changed, 15 insertions, 20 deletions
diff --git a/eclass/docs.eclass b/eclass/docs.eclass index ed1558bc9a84..859e8048893e 100644 --- a/eclass/docs.eclass +++ b/eclass/docs.eclass @@ -153,7 +153,7 @@ _DOCS_ECLASS=1 case ${DOCS_BUILDER} in "sphinx"|"mkdocs") # We need the python_gen_any_dep function - if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} ]]; then + if [[ ! ${_PYTHON_R1} && ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} ]]; then die "distutils-r1, python-r1, python-single-r1 or python-any-r1 needs to be inherited to use python based documentation builders" fi ;; diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 558f725f74b7..bec15f7ca0b6 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Michał Górny <mgorny@gentoo.org> # Based on work of: Krzysztof Pawlik <nelchael@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: python-utils-r1 # @BLURB: An eclass for packages having build-time dependency on Python. # @DESCRIPTION: @@ -38,13 +38,13 @@ # For more information, please see the Python Guide: # https://projects.gentoo.org/python/guide/ -case "${EAPI:-0}" in - [0-5]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - [6-8]) ;; - *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_PYTHON_ANY_R1} ]]; then +if [[ ! ${_PYTHON_ANY_R1_ECLASS} ]]; then +_PYTHON_ANY_R1_ECLASS=1 if [[ ${_PYTHON_R1} ]]; then die 'python-any-r1.eclass can not be used with python-r1.eclass.' @@ -54,10 +54,6 @@ fi inherit python-utils-r1 -fi - -EXPORT_FUNCTIONS pkg_setup - # @ECLASS_VARIABLE: PYTHON_COMPAT # @REQUIRED # @DESCRIPTION: @@ -205,8 +201,6 @@ _python_any_set_globals() { _python_any_set_globals unset -f _python_any_set_globals -if [[ ! ${_PYTHON_ANY_R1} ]]; then - # @FUNCTION: python_gen_any_dep # @USAGE: <dependency-block> # @DESCRIPTION: @@ -348,5 +342,6 @@ python-any-r1_pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && python_setup } -_PYTHON_ANY_R1=1 fi + +EXPORT_FUNCTIONS pkg_setup diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index caa37bc54ae2..bc10e83cf78a 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -45,7 +45,7 @@ if [[ ! ${_PYTHON_R1} ]]; then if [[ ${_PYTHON_SINGLE_R1} ]]; then die 'python-r1.eclass can not be used with python-single-r1.eclass.' -elif [[ ${_PYTHON_ANY_R1} ]]; then +elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then die 'python-r1.eclass can not be used with python-any-r1.eclass.' fi diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 740c3283d1b6..59673d2a5bf2 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -52,7 +52,7 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then if [[ ${_PYTHON_R1} ]]; then die 'python-single-r1.eclass can not be used with python-r1.eclass.' -elif [[ ${_PYTHON_ANY_R1} ]]; then +elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then die 'python-single-r1.eclass can not be used with python-any-r1.eclass.' fi diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index acb51300f348..9fc048cadcd5 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -95,7 +95,7 @@ inherit multiprocessing SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" -if [[ ${_PYTHON_ANY_R1} ]]; then +if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then # when using python-any-r1, use any-of dep API BDEPEND="$(python_gen_any_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")" @@ -137,7 +137,7 @@ escons() { if [[ ! ${EPYTHON} ]]; then eerror "EPYTHON is unset while calling escons. This most likely means that" eerror "the ebuild did not call the appropriate eclass function before calling scons." - if [[ ${_PYTHON_ANY_R1} ]]; then + if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." elif [[ ${_PYTHON_SINGLE_R1} ]]; then eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index 3ff74db0d796..e08515e45022 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -41,7 +41,7 @@ waf-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" local fail - if [[ ! ${_PYTHON_ANY_R1} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then + if [[ ! ${_PYTHON_ANY_R1_ECLASS} && ! ${_PYTHON_SINGLE_R1} && ! ${_PYTHON_R1} ]]; then eerror "Using waf-utils.eclass without any python-r1 suite eclass is not supported." eerror "Please make sure to configure and inherit appropriate -r1 eclass." eerror "For more information and examples, please see:" @@ -51,7 +51,7 @@ waf-utils_src_configure() { if [[ ! ${EPYTHON} ]]; then eerror "EPYTHON is unset while calling waf-utils. This most likely means that" eerror "the ebuild did not call the appropriate eclass function before calling waf." - if [[ ${_PYTHON_ANY_R1} ]]; then + if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()." elif [[ ${_PYTHON_SINGLE_R1} ]]; then eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()." |