[gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/

[Michał Górny]

commit:     331b7427e495112d3047c30eaa69c9a1bf85cf84
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  4 19:00:04 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec  4 19:01:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331b7427

sys-libs/compiler-rt-sanitizers: Try to stop pulling py3.10

Portage has a bug where repeated Python any-of (||) dependencies cause
it to wrongly pull Python 3.10 instead of being happy with the installed
interpreter.  Put the non-test? Python dependency into "!test?" block
to work around that.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild  | 4 +++-
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild  | 4 +++-
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild   | 4 +++-
 .../compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild  | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
index 13512435fcd3..68f7e7b395dd 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild
@@ -45,7 +45,9 @@ BDEPEND="
                =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
-       ${PYTHON_DEPS}"
+       !test? (
+               ${PYTHON_DEPS}
+       )"
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
index 166db1d476f2..f89af63c6d33 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
@@ -45,7 +45,9 @@ BDEPEND="
                =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
-       ${PYTHON_DEPS}"
+       !test? (
+               ${PYTHON_DEPS}
+       )"
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
index 584e656370cc..c456d296bcb8 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
@@ -45,7 +45,9 @@ BDEPEND="
                =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
-       ${PYTHON_DEPS}"
+       !test? (
+               ${PYTHON_DEPS}
+       )"
 
 LLVM_COMPONENTS=( compiler-rt )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
index 300f5b58df57..4e70cfd227c4 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
@@ -45,7 +45,9 @@ BDEPEND="
                =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
-       ${PYTHON_DEPS}"
+       !test? (
+               ${PYTHON_DEPS}
+       )"
 
 LLVM_COMPONENTS=( compiler-rt cmake )
 LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )