commit: 9826373b8a3be593d1927915521dba924136dc5e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 14:36:07 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 14:36:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9826373b
distutils-r1.eclass: Revert "Introduce DISTUTILS_USE_PEP517=no mode"
Reverts: e897148019dc484622c8c6a44153dd45694d8a99
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/distutils-r1.eclass | 30 +-----------------------------
1 file changed, 1 insertion(+), 29 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 5fb97b35fed3..d3826cf99c9f 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -106,8 +106,6 @@ esac
#
# - maturin - maturin backend
#
-# - no - no PEP517 build system (see below)
-#
# - pbr - pbr backend
#
# - pdm - pdm.pep517 backend
@@ -123,17 +121,6 @@ esac
#
# The variable needs to be set before the inherit line. The eclass
# adds appropriate build-time dependencies and verifies the value.
-#
-# The special value "no" indicates that the package has no build system.
-# This is not equivalent to unset DISTUTILS_USE_PEP517 (legacy mode).
-# It causes the eclass not to include any build system dependencies
-# and to disable default python_compile() and python_install()
-# implementations. Baseline Python deps and phase functions will still
-# be set (depending on the value of DISTUTILS_OPTIONAL). Most of
-# the other eclass functions will work. Testing venv will be provided
-# in ${BUILD_DIR}/install after python_compile(), and if any (other)
-# files are found in ${BUILD_DIR}/install after python_install(), they
-# will be merged into ${D}.
# @ECLASS_VARIABLE: DISTUTILS_USE_SETUPTOOLS
# @DEFAULT_UNSET
@@ -225,10 +212,6 @@ _distutils_set_globals() {
bdep+='
>=dev-util/maturin-0.12.7[${PYTHON_USEDEP}]'
;;
- no)
- # undo the generic deps added above
- bdep=
- ;;
pbr)
bdep+='
>=dev-python/pbr-5.8.0-r1[${PYTHON_USEDEP}]'
@@ -809,7 +792,7 @@ distutils_install_for_testing() {
distutils_write_namespace() {
debug-print-function ${FUNCNAME} "${@}"
- if [[ ! ${DISTUTILS_USE_PEP517:-no} != no ]]; then
+ if [[ ! ${DISTUTILS_USE_PEP517} ]]; then
die "${FUNCNAME} is available only in PEP517 mode"
fi
if [[ ${EBUILD_PHASE} != test || ! ${BUILD_DIR} ]]; then
@@ -932,9 +915,6 @@ _distutils-r1_print_package_versions() {
dev-util/maturin
)
;;
- no)
- return
- ;;
pbr)
packages+=(
dev-python/pbr
@@ -1236,10 +1216,6 @@ distutils_pep517_install() {
debug-print-function ${FUNCNAME} "${@}"
[[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: root"
- if [[ ! ${DISTUTILS_USE_PEP517:-no} != no ]]; then
- die "${FUNCNAME} is available only in PEP517 mode"
- fi
-
local root=${1}
local -x WHEEL_BUILD_DIR=${BUILD_DIR}/wheel
mkdir -p "${WHEEL_BUILD_DIR}" || die
@@ -1384,9 +1360,6 @@ distutils-r1_python_compile() {
in_iuse debug && use debug &&
MATURIN_PEP517_ARGS+="
--cargo-extra-args=--profile=dev"
;;
- no)
- return
- ;;
esac
if [[ ${DISTUTILS_USE_PEP517} ]]; then
@@ -1508,7 +1481,6 @@ distutils-r1_python_test() {
distutils-r1_python_install() {
debug-print-function ${FUNCNAME} "${@}"
- [[ ${DISTUTILS_USE_PEP517} == no ]] && return
_python_check_EPYTHON
local scriptdir=${EPREFIX}/usr/bin
