Switch to using underscore instead of hyphens in .pydistutils.cfg keys.
The latter form is now deprecated by setuptools, while both seem to work
fine with plain distutils.
Signed-off-by: Michał Górny <mgo...@gentoo.org>
---
eclass/distutils-r1.eclass | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f5b151d4b8e2..e384b6d43d4e 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -714,7 +714,7 @@ distutils-r1_python_configure() {
_distutils-r1_create_setup_cfg() {
cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
[build]
- build-base = ${BUILD_DIR}
+ build_base = ${BUILD_DIR}
# using a single directory for them helps us export
# ${PYTHONPATH} and ebuilds find the sources independently
@@ -723,16 +723,16 @@ _distutils-r1_create_setup_cfg() {
# note: due to some packages (wxpython) relying on separate
# platlib & purelib dirs, we do not set --build-lib (which
# can not be overridden with --build-*lib)
- build-platlib = %(build-base)s/lib
- build-purelib = %(build-base)s/lib
+ build_platlib = %(build_base)s/lib
+ build_purelib = %(build_base)s/lib
# make the ebuild writer lives easier
- build-scripts = %(build-base)s/scripts
+ build_scripts = %(build_base)s/scripts
# this is needed by distutils_install_for_testing since
# setuptools like to create .egg files for install --home.
[bdist_egg]
- dist-dir = ${BUILD_DIR}/dist
+ dist_dir = ${BUILD_DIR}/dist
_EOF_
# we can't refer to ${D} before src_install()
@@ -749,7 +749,7 @@ _distutils-r1_create_setup_cfg() {
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
- install-scripts = $(python_get_scriptdir)
+ install_scripts = $(python_get_scriptdir)
_EOF_
fi
fi
--
2.30.1
