From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 1/8] python-any-r1.eclass: Fix python_gen_any_dep w/ PYTHON_REQ_USE
Date: Fri, 22 Nov 2024 14:38:40 +0100 [thread overview]
Message-ID: <20241122134526.29956-2-mgorny@gentoo.org> (raw)
In-Reply-To: <20241122134526.29956-1-mgorny@gentoo.org>
Fix `python_gen_any_dep()` to correctly strip the `:=` operator when
it does not occur at the end of `PYTHON_PKG_DEP`, i.e. when
`PYTHON_REQ_USE` is used and a USE dependency string is appended.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
eclass/python-any-r1.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 0c01a49f9000..ca2ddf146406 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -259,7 +259,7 @@ python_gen_any_dep() {
local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}}
# note: need to strip '=' slot operator for || deps
- out="( ${PYTHON_PKG_DEP%:=} ${i_depstr} ) ${out}"
+ out="( ${PYTHON_PKG_DEP/:=} ${i_depstr} ) ${out}"
done
echo "|| ( ${out})"
}
--
2.47.0
next prev parent reply other threads:[~2024-11-22 13:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-22 13:38 [gentoo-dev] [PATCH 0/8] Next Python eclass batch (incl. PyPy slots and non-urgent changes) Michał Górny
2024-11-22 13:38 ` Michał Górny [this message]
2024-11-22 13:38 ` [gentoo-dev] [PATCH 2/8] python-any-r1.eclass: Remove obsolete variable Michał Górny
2024-11-22 13:38 ` [gentoo-dev] [PATCH 3/8] python-utils-r1.eclass: Depend on dev-lang/pypy directly Michał Górny
2024-11-22 13:38 ` [gentoo-dev] [PATCH 4/8] python-utils-r1.eclass: Move python3_13t before other python* Michał Górny
2024-11-22 13:38 ` [gentoo-dev] [PATCH 5/8] distutils-r1.eclass: Update maturin's skip auditwheel option Michał Górny
2024-11-22 13:38 ` [gentoo-dev] [PATCH 6/8] distutils-r1.eclass: Use HATCH_METADATA_CLASSIFIERS_NO_VERIFY Michał Górny
2024-11-22 13:38 ` [gentoo-dev] [PATCH 7/8] distutils-r1.eclass: Also do SETUPTOOLS_RUST_CARGO_PROFILE uncond Michał Górny
2024-11-22 13:38 ` [gentoo-dev] [PATCH 8/8] distutils-r1.eclass: Disable setuptools trove-classifier validation 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=20241122134526.29956-2-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