| 1 |
commit: 61d3e4f58783d613521c9cd9d2877c932212e460 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 31 08:59:17 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 9 08:09:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d3e4f5 |
| 7 |
|
| 8 |
python-utils-r1.eclass: Bump minimal Python versions |
| 9 |
|
| 10 |
Bump minimal Python package versions to ensure that the python-exec deps |
| 11 |
are inside. |
| 12 |
|
| 13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 14 |
|
| 15 |
eclass/python-utils-r1.eclass | 10 ++++++++-- |
| 16 |
eclass/tests/distutils-r1.sh | 2 +- |
| 17 |
eclass/tests/distutils-r1_single.sh | 2 +- |
| 18 |
3 files changed, 10 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 21 |
index 22e00c56815d..ff5b350cd469 100644 |
| 22 |
--- a/eclass/python-utils-r1.eclass |
| 23 |
+++ b/eclass/python-utils-r1.eclass |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2021 Gentoo Authors |
| 26 |
+# Copyright 1999-2022 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
# @ECLASS: python-utils-r1.eclass |
| 30 |
@@ -416,12 +416,18 @@ _python_export() { |
| 31 |
case ${impl} in |
| 32 |
python2.7) |
| 33 |
PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';; |
| 34 |
+ python3.8) |
| 35 |
+ PYTHON_PKG_DEP=">=dev-lang/python-3.8.12_p1-r1:3.8";; |
| 36 |
+ python3.9) |
| 37 |
+ PYTHON_PKG_DEP=">=dev-lang/python-3.9.9-r1:3.9";; |
| 38 |
+ python3.10) |
| 39 |
+ PYTHON_PKG_DEP=">=dev-lang/python-3.10.0_p1-r1:3.10";; |
| 40 |
python*) |
| 41 |
PYTHON_PKG_DEP="dev-lang/python:${impl#python}";; |
| 42 |
pypy) |
| 43 |
PYTHON_PKG_DEP='>=dev-python/pypy-7.3.0:0=';; |
| 44 |
pypy3) |
| 45 |
- PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.7:0=';; |
| 46 |
+ PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.7-r1:0=';; |
| 47 |
*) |
| 48 |
die "Invalid implementation: ${impl}" |
| 49 |
esac |
| 50 |
|
| 51 |
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh |
| 52 |
index 1ccb1dfbc523..a582bd9bbee7 100755 |
| 53 |
--- a/eclass/tests/distutils-r1.sh |
| 54 |
+++ b/eclass/tests/distutils-r1.sh |
| 55 |
@@ -97,7 +97,7 @@ tend |
| 56 |
einfo distutils_enable_tests |
| 57 |
eindent |
| 58 |
BASE_IUSE="python_targets_python3_8" |
| 59 |
-BASE_DEPS="python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]" |
| 60 |
+BASE_DEPS="python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?]" |
| 61 |
TEST_RESTRICT="!test? ( test )" |
| 62 |
|
| 63 |
einfo "empty RDEPEND" |
| 64 |
|
| 65 |
diff --git a/eclass/tests/distutils-r1_single.sh b/eclass/tests/distutils-r1_single.sh |
| 66 |
index 56b62ca0e90f..8d07eebb133f 100755 |
| 67 |
--- a/eclass/tests/distutils-r1_single.sh |
| 68 |
+++ b/eclass/tests/distutils-r1_single.sh |
| 69 |
@@ -77,7 +77,7 @@ inherit distutils-r1 |
| 70 |
einfo distutils_enable_tests |
| 71 |
eindent |
| 72 |
BASE_IUSE="+python_single_target_python3_8" |
| 73 |
-BASE_DEPS="python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )" |
| 74 |
+BASE_DEPS="python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )" |
| 75 |
TEST_RESTRICT="!test? ( test )" |
| 76 |
|
| 77 |
einfo "empty RDEPEND" |
Archives