diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2024-10-20 17:37:22 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2024-11-30 08:16:13 +0100 |
| commit | 28b4477c365acffb7b04300f028fa87e9875932f (patch) | |
| tree | ac05116ad4b1f6774985766a12e5998388530c59 /eclass | |
| parent | python-any-r1.eclass: Remove obsolete variable (diff) | |
| download | gentoo-28b4477c365acffb7b04300f028fa87e9875932f.tar.gz gentoo-28b4477c365acffb7b04300f028fa87e9875932f.tar.bz2 gentoo-28b4477c365acffb7b04300f028fa87e9875932f.zip | |
python-utils-r1.eclass: Depend on dev-lang/pypy directly
Depend on `>=dev-lang/pypy-3.10:=` rather than the backwards
compatibility `dev-python/pypy3` package. Note that the package needs
to remain at least for some time after the next subslot bump, so that
users rebuild all packages and get the updated dependency across
the system.
Note that this requires pkgcheck to be updated first.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/python-utils-r1.eclass | 9 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index aa22b164020c..0cb132b72e3a 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -450,20 +450,15 @@ _python_export() { local d case ${impl} in python*) - PYTHON_PKG_DEP="dev-lang/python:${impl#python}" + PYTHON_PKG_DEP="dev-lang/python:${impl#python}${PYTHON_REQ_USE:+[${PYTHON_REQ_USE}]}" ;; pypy3) - PYTHON_PKG_DEP="dev-python/${impl}:=" + PYTHON_PKG_DEP=">=dev-lang/pypy-3.10:=[symlink${PYTHON_REQ_USE:+,${PYTHON_REQ_USE}}]" ;; *) die "Invalid implementation: ${impl}" esac - # use-dep - if [[ ${PYTHON_REQ_USE} ]]; then - PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}] - fi - export PYTHON_PKG_DEP debug-print "${FUNCNAME}: PYTHON_PKG_DEP = ${PYTHON_PKG_DEP}" ;; diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 732f53381b22..81c3c6f78158 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -79,6 +79,7 @@ for minor in {10..13} 13t; do test_var PYTHON_LIBS "python3_${minor}" "*-lpython3.${minor}*" fi test_var PYTHON_PKG_DEP "python3_${minor}" "*dev-lang/python*:3.${minor}" + PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP "python3_${minor}" "*dev-lang/python*:3.${minor}\[sqlite\]" test_var PYTHON_SCRIPTDIR "python3_${minor}" "/usr/lib/python-exec/python3.${minor}" tbegin "Testing that python3_${minor} is present in an impl array" @@ -126,7 +127,8 @@ 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*:=' +test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink\]' +PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink,sqlite\]' test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3 eoutdent |