profiles: Masked dev-vcs/git[pcre] USE flag for some arches

Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

5 files changed, 14 insertions, 6 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index d04202790fd5..3f1ec1a27b96 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -246,7 +246,9 @@ media-sound/pulseaudio native-headset
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
+>=dev-vcs/git-2.31.0 pcre
 
 # Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index deee3c915d5e..17213375e57e 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -192,7 +192,9 @@ net-libs/gnutls test-full
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
+>=dev-vcs/git-2.31.0 pcre
 
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index e0d573c6fb4a..0960dd767c37 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -202,7 +202,9 @@ media-sound/pulseaudio native-headset
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
+>=dev-vcs/git-2.31.0 pcre
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-07-20)
 # pulls in unkeyworded java
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 480003b3c1d5..0ebbd9ce43d5 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -66,7 +66,8 @@ sys-fs/e2fsprogs cron
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
-dev-vcs/git pcre-jit
+<dev-vcs/git-2.31.0 pcre-jit
+>=dev-vcs/git-2.31.0 pcre
 
 # Not yet tested / unkeyworded dependencies
 # This includes also packages which do not support python-3 or
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
index 1783fe2a335d..c233f0b110c0 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,10 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+<dev-vcs/git-2.31.0 pcre-jit
+>=dev-vcs/git-2.31.0 pcre
 
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # jit not supported on sparc64