diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39578 -> 39586 bytes | |||
| -rw-r--r-- | eclass/epatch.eclass | 3 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 8 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex ea9aefbcedb5..1bee039d0bb0 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index c42aef8e80d1..ff3fd13721fe 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -1,6 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# @DEAD # @ECLASS: epatch.eclass # @MAINTAINER: # base-system@gentoo.org diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index bbf751399476..275ac3a96523 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -40,7 +40,7 @@ inherit multiprocessing toolchain-funcs # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( pypy3 - python3_{10..12} + python3_{10..13} ) readonly _PYTHON_ALL_IMPLS @@ -80,7 +80,7 @@ _python_verify_patterns() { local impl pattern for pattern; do case ${pattern} in - -[23]|3.[89]|3.1[012]) + -[23]|3.[89]|3.1[0-3]) continue ;; esac @@ -136,7 +136,7 @@ _python_set_impls() { # please keep them in sync with _PYTHON_ALL_IMPLS # and _PYTHON_HISTORICAL_IMPLS case ${i} in - pypy3|python3_9|python3_1[0-2]) + pypy3|python3_9|python3_1[0-3]) ;; jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9]) obsolete+=( "${i}" ) @@ -231,7 +231,7 @@ _python_impl_matches() { [[ ${impl} == python${pattern/./_} || ${impl} == pypy3 ]] && return 0 ;; - 3.8|3.9|3.1[1-2]) + 3.8|3.9|3.1[1-3]) [[ ${impl} == python${pattern/./_} ]] && return 0 ;; *) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 81c459765f0f..93cea324a3df 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -64,7 +64,7 @@ tmpfile=$(mktemp) inherit python-utils-r1 -for minor in {10..12}; do +for minor in {10..13}; do ebegin "Testing python3.${minor}" eindent test_var EPYTHON "python3_${minor}" "python3.${minor}" @@ -126,7 +126,7 @@ if [[ -x /usr/bin/pypy3 ]]; then test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.*/site-packages" test_var PYTHON_INCLUDEDIR pypy3 "/usr/include/pypy3.*" fi -test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:0=' +test_var PYTHON_PKG_DEP pypy3 '*dev-python/pypy3*:=' test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 eoutdent |