From: David Seifert <soap@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: David Seifert <soap@gentoo.org>
Subject: [gentoo-dev] [PATCH 08/50] distutils-r1.eclass: drop support for EAPI 6
Date: Tue, 27 Aug 2024 17:14:53 +0200 [thread overview]
Message-ID: <20240827151553.210835-8-soap@gentoo.org> (raw)
In-Reply-To: <20240827151553.210835-1-soap@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/distutils-r1.eclass | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 0f9dc8d14d5e..11ac961f8c9d 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1022,7 +1022,7 @@ _distutils-r1_create_setup_cfg() {
[install]
compile = True
optimize = 2
- root = ${D%/}
+ root = ${D}
_EOF_
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
@@ -1520,10 +1520,10 @@ _distutils-r1_wrap_scripts() {
local scriptdir=$(python_get_scriptdir)
local f python_files=() non_python_files=()
- if [[ -d ${D%/}${scriptdir} ]]; then
- for f in "${D%/}${scriptdir}"/*; do
+ if [[ -d ${D}${scriptdir} ]]; then
+ for f in "${D}${scriptdir}"/*; do
[[ -d ${f} ]] && die "Unexpected directory: ${f}"
- debug-print "${FUNCNAME}: found executable at ${f#${D%/}/}"
+ debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
local shebang
read -r shebang < "${f}"
@@ -1535,7 +1535,7 @@ _distutils-r1_wrap_scripts() {
non_python_files+=( "${f}" )
fi
- mkdir -p "${D%/}${bindir}" || die
+ mkdir -p "${D}${bindir}" || die
done
for f in "${python_files[@]}"; do
@@ -1551,8 +1551,8 @@ _distutils-r1_wrap_scripts() {
for f in "${non_python_files[@]}"; do
local basename=${f##*/}
- debug-print "${FUNCNAME}: moving ${f#${D%/}/} to ${bindir}/${basename}"
- mv "${f}" "${D%/}${bindir}/${basename}" || die
+ debug-print "${FUNCNAME}: moving ${f#${D}/} to ${bindir}/${basename}"
+ mv "${f}" "${D}${bindir}/${basename}" || die
done
fi
}
@@ -1660,8 +1660,8 @@ distutils-r1_python_install() {
find "${BUILD_DIR}"/install -type d -empty -delete || die
[[ -d ${BUILD_DIR}/install ]] && merge_root=1
else
- local root=${D%/}/_${EPYTHON}
- [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}
+ local root=${D}/_${EPYTHON}
+ [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
# inline DISTUTILS_ARGS logic from esetup.py in order to make
# argv overwriting easier
@@ -1715,7 +1715,7 @@ distutils-r1_python_install() {
fi
if [[ ${merge_root} ]]; then
- multibuild_merge_root "${root}" "${D%/}"
+ multibuild_merge_root "${root}" "${D}"
fi
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
_distutils-r1_wrap_scripts "${scriptdir}"
@@ -2098,7 +2098,7 @@ _distutils-r1_strip_namespace_packages() {
_distutils-r1_post_python_install() {
debug-print-function ${FUNCNAME} "${@}"
- local sitedir=${D%/}$(python_get_sitedir)
+ local sitedir=${D}$(python_get_sitedir)
if [[ -d ${sitedir} ]]; then
_distutils-r1_strip_namespace_packages "${sitedir}"
@@ -2157,13 +2157,13 @@ _distutils-r1_check_namespace_pth() {
while IFS= read -r -d '' f; do
pth+=( "${f}" )
- done < <(find "${ED%/}" -name '*-nspkg.pth' -print0)
+ done < <(find "${ED}" -name '*-nspkg.pth' -print0)
if [[ ${pth[@]} ]]; then
eerror "The following *-nspkg.pth files were found installed:"
eerror
for f in "${pth[@]}"; do
- eerror " ${f#${ED%/}}"
+ eerror " ${f#${ED}}"
done
eerror
eerror "The presence of those files may break namespaces in Python 3.5+. Please"
--
2.46.0
next prev parent reply other threads:[~2024-08-27 15:18 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 15:14 [gentoo-dev] [PATCH 01/50] apache-module.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 02/50] autotools.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 03/50] bash-completion-r1.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 04/50] cdrom.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 05/50] check-reqs.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 06/50] depend.apache.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 07/50] desktop.eclass: " David Seifert
2024-08-27 15:14 ` David Seifert [this message]
2024-08-27 15:14 ` [gentoo-dev] [PATCH 09/50] flag-o-matic.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 10/50] fortran-2.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 11/50] gap-pkg.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 12/50] gnuconfig.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 13/50] java-pkg-2.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 14/50] java-utils-2.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 15/50] libtool.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 16/50] mono-env.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 17/50] multibuild.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 18/50] multilib-build.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 19/50] multilib-minimal.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 20/50] multilib.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 21/50] multiprocessing.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 22/50] out-of-source-utils.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 23/50] pax-utils.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 24/50] perl-functions.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 25/50] php-pear-r2.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 26/50] portability.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 27/50] prefix.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 28/50] preserve-libs.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 29/50] python-r1.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 30/50] python-utils-r1.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 31/50] readme.gentoo-r1.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 32/50] ruby-fakegem.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 33/50] ruby-ng.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 34/50] ruby-utils.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 35/50] strip-linguas.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 36/50] systemd.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 37/50] tmpfiles.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 38/50] toolchain-funcs.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 39/50] toolchain.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 40/50] udev.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 41/50] vcs-clean.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 42/50] vdr-plugin-2.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 43/50] vim-doc.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 44/50] vim-plugin.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 45/50] vim-spell.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 46/50] virtualx.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 47/50] webapp.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 48/50] wrapper.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 49/50] xdg-utils.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 50/50] xdg.eclass: drop support for EAPI 6 David Seifert
2024-08-27 21:03 ` [gentoo-dev] [PATCH 00/50] XXXXXX.eclass: drop support for EAPI6 Robin H. Johnson
2024-08-27 21:16 ` Eli Schwartz
2024-08-27 21:36 ` Sam James
2024-08-28 9:45 ` Ulrich Mueller
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=20240827151553.210835-8-soap@gentoo.org \
--to=soap@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