diff options
author | Michał Górny <mgorny@gentoo.org> | 2021-12-31 10:16:25 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2022-01-09 09:09:07 +0100 |
commit | 348d59c6d8fc23042077364580d399337be6e5fb (patch) | |
tree | 1cf290592fd1265f965dde26cfca55da8d6dbb97 /eclass | |
parent | python-utils-r1.eclass: Bump minimal Python versions (diff) | |
download | gentoo-348d59c6d8fc23042077364580d399337be6e5fb.tar.gz gentoo-348d59c6d8fc23042077364580d399337be6e5fb.tar.bz2 gentoo-348d59c6d8fc23042077364580d399337be6e5fb.zip |
python*-r1.eclass: Remove explicit dep on python-exec
The dev-lang/python-exec dependency is now enforced through
dev-lang/python, remove the explicit dep to reduce the metadata size
and make dependency resolution lighter.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/python-r1.eclass | 9 | ||||
-rw-r--r-- | eclass/python-single-r1.eclass | 8 | ||||
-rwxr-xr-x | eclass/tests/distutils-r1.sh | 2 | ||||
-rwxr-xr-x | eclass/tests/distutils-r1_single.sh | 2 |
4 files changed, 4 insertions, 17 deletions
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index dc624946cfc1..4b51cc18b959 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-r1.eclass @@ -125,7 +125,6 @@ fi # # Example value: # @CODE -# dev-lang/python-exec:= # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] ) # python_targets_pypy? ( dev-python/pypy[gdbm] ) # @CODE @@ -207,12 +206,6 @@ _python_set_globals() { local requse="|| ( ${flags[*]} )" local usedep=${optflags// /,} - # 1) well, python-exec would suffice as an RDEP - # but no point in making this overcomplex, BDEP doesn't hurt anyone - # 2) python-exec should be built with all targets forced anyway - # but if new targets were added, we may need to force a rebuild - deps+=">=dev-lang/python-exec-2:=[${usedep}]" - if [[ ${PYTHON_DEPS+1} ]]; then # IUSE is magical, so we can't really check it # (but we verify PYTHON_COMPAT already) diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 228c66a77af6..5a4bcea55da4 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-single-r1.eclass @@ -136,7 +136,6 @@ EXPORT_FUNCTIONS pkg_setup # # Example value: # @CODE -# dev-lang/python-exec:= # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] ) # python_single_target_pypy? ( dev-python/pypy[gdbm] ) # @CODE @@ -219,13 +218,8 @@ _python_single_set_globals() { local deps= i PYTHON_PKG_DEP for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do _python_export "${i}" PYTHON_PKG_DEP - # 1) well, python-exec would suffice as an RDEP - # but no point in making this overcomplex, BDEP doesn't hurt anyone - # 2) python-exec should be built with all targets forced anyway - # but if new targets were added, we may need to force a rebuild deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} - >=dev-lang/python-exec-2:=[python_targets_${i}] ) " done diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh index a582bd9bbee7..cd768066bf37 100755 --- a/eclass/tests/distutils-r1.sh +++ b/eclass/tests/distutils-r1.sh @@ -97,7 +97,7 @@ tend einfo distutils_enable_tests eindent BASE_IUSE="python_targets_python3_8" -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(-)?]" +BASE_DEPS="python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )" TEST_RESTRICT="!test? ( test )" einfo "empty RDEPEND" diff --git a/eclass/tests/distutils-r1_single.sh b/eclass/tests/distutils-r1_single.sh index 8d07eebb133f..fdeba2e2b9b2 100755 --- a/eclass/tests/distutils-r1_single.sh +++ b/eclass/tests/distutils-r1_single.sh @@ -77,7 +77,7 @@ inherit distutils-r1 einfo distutils_enable_tests eindent BASE_IUSE="+python_single_target_python3_8" -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] )" +BASE_DEPS="python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 )" TEST_RESTRICT="!test? ( test )" einfo "empty RDEPEND" |