diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38161 -> 38156 bytes | |||
| -rw-r--r-- | eclass/cmake.eclass | 9 | ||||
| -rw-r--r-- | eclass/distutils-r1.eclass | 24 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 12 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 2 |
5 files changed, 35 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 0e641809214b..e7aa272cda1a 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 1cdbc123a243..d70f2cbf1fac 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -293,6 +293,15 @@ _cmake_check_build_dir() { BUILD_DIR="${CMAKE_USE_DIR}" else : "${BUILD_DIR:=${CMAKE_USE_DIR}_build}" + + # Avoid creating ${WORKDIR}_build (which is above WORKDIR). + # TODO: For EAPI > 8, we should ban S=WORKDIR for CMake. + # See bug #889420. + if [[ ${S} == "${WORKDIR}" && ${BUILD_DIR} == "${WORKDIR}_build" ]] ; then + eqawarn "QA notice: S=WORKDIR is deprecated for cmake.eclass." + eqawarn "Please relocate the sources in src_unpack." + BUILD_DIR="${WORKDIR}"/${P}_build + fi fi einfo "Source directory (CMAKE_USE_DIR): \"${CMAKE_USE_DIR}\"" diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 7a7b762ef059..fd9bf47aa963 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -212,7 +212,7 @@ _distutils_set_globals() { case ${DISTUTILS_USE_PEP517} in flit) bdep+=' - >=dev-python/flit-core-3.8.0[${PYTHON_USEDEP}] + >=dev-python/flit-core-3.9.0[${PYTHON_USEDEP}] ' ;; flit_scm) @@ -256,12 +256,17 @@ _distutils_set_globals() { ;; pdm-backend) bdep+=' - >=dev-python/pdm-backend-2.0.7[${PYTHON_USEDEP}] + >=dev-python/pdm-backend-2.1.0[${PYTHON_USEDEP}] ' ;; poetry) bdep+=' - >=dev-python/poetry-core-1.5.2[${PYTHON_USEDEP}] + >=dev-python/poetry-core-1.6.1[${PYTHON_USEDEP}] + ' + ;; + scikit-build-core) + bdep+=' + >=dev-python/scikit-build-core-0.4.6[${PYTHON_USEDEP}] ' ;; setuptools) @@ -272,7 +277,7 @@ _distutils_set_globals() { ;; sip) bdep+=' - >=dev-python/sip-6.7.8[${PYTHON_USEDEP}] + >=dev-python/sip-6.7.9[${PYTHON_USEDEP}] ' ;; standalone) @@ -287,7 +292,7 @@ _distutils_set_globals() { eqawarn "is enabled." fi else - local setuptools_dep='>=dev-python/setuptools-65.7.0[${PYTHON_USEDEP}]' + local setuptools_dep='>=dev-python/setuptools-67.7.2[${PYTHON_USEDEP}]' case ${DISTUTILS_USE_SETUPTOOLS:-bdepend} in no|manual) @@ -1002,9 +1007,15 @@ _distutils-r1_print_package_versions() { dev-python/poetry-core ) ;; + scikit-build-core) + packages+=( + dev-python/scikit-build-core + ) + ;; setuptools) packages+=( dev-python/setuptools + dev-python/setuptools-rust dev-python/setuptools-scm dev-python/wheel ) @@ -1200,6 +1211,9 @@ _distutils-r1_backend_to_key() { poetry.core.masonry.api|poetry.masonry.api) echo poetry ;; + scikit_build_core.build) + echo scikit-build-core + ;; setuptools.build_meta|setuptools.build_meta:__legacy__) echo setuptools ;; diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 7a1be381f596..40c15b65d7a5 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -238,12 +238,12 @@ _python_impl_matches() { fi return 0 ;; - 3.9) - # the only unmasked pypy3 version is pypy3.9 atm + 3.9|3.10) + # <pypy3-7.3.12 is 3.9, >=7.3.12 is 3.10 [[ ${impl} == python${pattern/./_} || ${impl} == pypy3 ]] && return 0 ;; - 3.8|3.1[0-2]) + 3.8|3.1[1-2]) [[ ${impl} == python${pattern/./_} ]] && return 0 ;; *) @@ -448,11 +448,11 @@ _python_export() { local d case ${impl} in python3.10) - PYTHON_PKG_DEP=">=dev-lang/python-3.10.11:3.10";; + PYTHON_PKG_DEP=">=dev-lang/python-3.10.12:3.10";; python3.11) - PYTHON_PKG_DEP=">=dev-lang/python-3.11.3:3.11";; + PYTHON_PKG_DEP=">=dev-lang/python-3.11.4:3.11";; python3.12) - PYTHON_PKG_DEP=">=dev-lang/python-3.12.0_beta1:3.12";; + PYTHON_PKG_DEP=">=dev-lang/python-3.12.0_beta3:3.12";; pypy3) PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.11_p1:0=';; *) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 635d49decbdd..81c459765f0f 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -208,7 +208,7 @@ test_is "_python_impl_matches python3_11 3.12" 1 test_is "_python_impl_matches python3_12 3.10" 1 test_is "_python_impl_matches python3_12 3.11" 1 test_is "_python_impl_matches python3_12 3.12" 0 -test_is "_python_impl_matches pypy3 3.10" 1 +test_is "_python_impl_matches pypy3 3.10" 0 test_is "_python_impl_matches pypy3 3.11" 1 test_is "_python_impl_matches pypy3 3.12" 1 eoutdent |