From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 6/7] distutils-r1.eclass: Remove support for gpep517 < 9
Date: Fri, 25 Nov 2022 18:05:07 +0100 [thread overview]
Message-ID: <20221125170508.23064-7-mgorny@gentoo.org> (raw)
In-Reply-To: <20221125170508.23064-1-mgorny@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
eclass/distutils-r1.eclass | 37 ++++++++-----------------------------
1 file changed, 8 insertions(+), 29 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1cc4626f3a12..97c5e562bc0f 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1265,25 +1265,14 @@ distutils_wheel_install() {
local wheel=${2}
einfo " Installing ${wheel##*/} to ${root}"
- if has_version -b ">=dev-python/gpep517-9"; then
- # TODO: inline when we dep on >=9
- local cmd=(
- gpep517 install-wheel
- --destdir="${root}"
- --interpreter="${PYTHON}"
- --prefix="${EPREFIX}/usr"
- --optimize=all
- "${wheel}"
- )
- else
- local cmd=(
- gpep517 install-wheel
- --destdir="${root}"
- --interpreter="${PYTHON}"
- --prefix="${EPREFIX}/usr"
- "${wheel}"
- )
- fi
+ local cmd=(
+ gpep517 install-wheel
+ --destdir="${root}"
+ --interpreter="${PYTHON}"
+ --prefix="${EPREFIX}/usr"
+ --optimize=all
+ "${wheel}"
+ )
printf '%s\n' "${cmd[*]}"
"${cmd[@]}" || die "Wheel install failed"
@@ -2018,16 +2007,6 @@ _distutils-r1_post_python_install() {
die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
fi
done
-
- if [[ ${DISTUTILS_USE_PEP517} ]]; then
- if ! has_version -b ">=dev-python/gpep517-9"
- then
- # TODO: remove when we dep on >=9
- # we need to recompile everything here in order to embed
- # the correct paths
- python_optimize "${sitedir}"
- fi
- fi
fi
}
--
2.38.1
next prev parent reply other threads:[~2022-11-25 17:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 17:05 [gentoo-dev] [PATCH 0/7] distutils-r1.eclass: mesonpy option passing support + periodic cleanup Michał Górny
2022-11-25 17:05 ` [gentoo-dev] [PATCH 1/7] ninja-utils.eclass: Split get_NINJAOPTS out Michał Górny
2022-11-25 17:05 ` [gentoo-dev] [PATCH 2/7] distutils-r1.eclass: Pass options to meson-python backend Michał Górny
2022-11-25 17:05 ` [gentoo-dev] [PATCH 3/7] dev-python/scipy: Pass -Dblas, -Dlapack via DISTUTILS_ARGS Michał Górny
2022-11-25 17:05 ` [gentoo-dev] [PATCH 4/7] distutils-r1.eclass: Bump min dep versions to newest stable Michał Górny
2022-11-25 17:05 ` [gentoo-dev] [PATCH 5/7] distutils-r1.eclass: Print versions of common hatch plugins Michał Górny
2022-11-25 17:05 ` Michał Górny [this message]
2022-11-25 17:05 ` [gentoo-dev] [PATCH 7/7] python-utils-r1.eclass: Bump min Python versions Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221125170508.23064-7-mgorny@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox