From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 498F2158020 for ; Sun, 25 Dec 2022 22:22:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 265A2E0ACF; Sun, 25 Dec 2022 22:16:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6529E0ACC for ; Sun, 25 Dec 2022 22:16:34 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 24/41] python-any-r1.eclass: drop EAPI 6 support Date: Sun, 25 Dec 2022 23:15:35 +0100 Message-Id: <20221225221552.8023-24-soap@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225221552.8023-1-soap@gentoo.org> References: <20221225221552.8023-1-soap@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 0750df84-2a8b-40f5-b8ee-7e4e29f38375 X-Archives-Hash: 16351d867f6ebb794d0bb209db6be830 Signed-off-by: David Seifert --- eclass/docs.eclass | 2 +- eclass/python-any-r1.eclass | 21 ++++++++------------- eclass/python-r1.eclass | 2 +- eclass/python-single-r1.eclass | 2 +- eclass/scons-utils.eclass | 4 ++-- eclass/waf-utils.eclass | 4 ++-- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/eclass/docs.eclass b/eclass/docs.eclass index ed1558bc9a8..859e8048893 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 558f725f74b..bec15f7ca0b 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Michał Górny # Based on work of: Krzysztof Pawlik -# @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: # @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 caa37bc54ae..bc10e83cf78 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 740c3283d1b..59673d2a5bf 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 acb51300f34..9fc048cadcd 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 3ff74db0d79..e08515e4502 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()." -- 2.39.0