commit: c274ff15c3daa526f567c4cb6e500b9a50214db6 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Oct 8 15:31:28 2024 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Oct 8 15:31:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c274ff15
python-r1.eclass: drop support for EAPI 6 Signed-off-by: David Seifert <soap <AT> gentoo.org> eclass/python-r1.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index adf87c2c52f7..28daaed1b463 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -30,14 +30,14 @@ # For more information, please see the Python Guide: # https://projects.gentoo.org/python/guide/ +if [[ -z ${_PYTHON_R1_ECLASS} ]]; then +_PYTHON_R1_ECLASS=1 + case ${EAPI} in 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_PYTHON_R1_ECLASS} ]]; then -_PYTHON_R1_ECLASS=1 - if [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then die 'python-r1.eclass can not be used with python-single-r1.eclass.' elif [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then @@ -789,7 +789,7 @@ python_replicate_script() { ) python_fix_shebang -q \ - "${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}" + "${files[@]/*\//${D}${PYTHON_SCRIPTDIR}/}" } local files=( "${@}" )
