commit: 7b6ceeb3e8245f1314bfee469d942613613cd4c2 Author: Cédric Krier <cedk <AT> gentoo <DOT> org> AuthorDate: Fri Aug 9 07:29:20 2024 +0000 Commit: Cédric Krier <cedk <AT> gentoo <DOT> org> CommitDate: Fri Aug 9 07:29:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6ceeb3
dev-vcs/mercurial: call cargo_gen_config even when rust is not active Since 9b2def86a9c7fd8821a5b83df7d250fc4c73540f distutils-r1 installs under cargo_env when cargo eclass is inherited even if the rust flag is not set. But cargo_env fails if cargo_gen_config was not run prior. Closes: https://bugs.gentoo.org/937578 Signed-off-by: Cédric Krier <cedk <AT> gentoo.org> dev-vcs/mercurial/mercurial-6.5.3.ebuild | 3 +++ dev-vcs/mercurial/mercurial-6.6.2.ebuild | 3 +++ dev-vcs/mercurial/mercurial-6.7.4.ebuild | 3 +++ dev-vcs/mercurial/mercurial-6.8.ebuild | 3 +++ dev-vcs/mercurial/mercurial-9999.ebuild | 3 +++ 5 files changed, 15 insertions(+) diff --git a/dev-vcs/mercurial/mercurial-6.5.3.ebuild b/dev-vcs/mercurial/mercurial-6.5.3.ebuild index 85d2231bfc00..8c1137cfcd01 100644 --- a/dev-vcs/mercurial/mercurial-6.5.3.ebuild +++ b/dev-vcs/mercurial/mercurial-6.5.3.ebuild @@ -197,6 +197,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild index 0590d5d5179c..ed79e2235c03 100644 --- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild @@ -207,6 +207,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } diff --git a/dev-vcs/mercurial/mercurial-6.7.4.ebuild b/dev-vcs/mercurial/mercurial-6.7.4.ebuild index b2c31e30fd96..6207efb0c49b 100644 --- a/dev-vcs/mercurial/mercurial-6.7.4.ebuild +++ b/dev-vcs/mercurial/mercurial-6.7.4.ebuild @@ -218,6 +218,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } diff --git a/dev-vcs/mercurial/mercurial-6.8.ebuild b/dev-vcs/mercurial/mercurial-6.8.ebuild index 6bde814f104e..38d629066192 100644 --- a/dev-vcs/mercurial/mercurial-6.8.ebuild +++ b/dev-vcs/mercurial/mercurial-6.8.ebuild @@ -216,6 +216,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 2570197211e5..45093fbe0880 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -43,6 +43,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_live_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi }
