commit:     41960d7e948f2b3528105641819345fed915a847
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 09:53:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 09:53:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41960d7e

profiles: cleanup obsolete git[pcre-jit] entries

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/arch/alpha/package.use.mask        | 8 +-------
 profiles/arch/hppa/package.use.mask         | 8 +-------
 profiles/arch/ia64/package.use.mask         | 8 +-------
 profiles/arch/s390/package.use.mask         | 7 +------
 profiles/arch/s390/s390x/package.use.mask   | 3 +--
 profiles/arch/sparc/64ul/package.use.mask   | 7 +------
 profiles/features/hardened/package.use.mask | 5 +----
 7 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/profiles/arch/alpha/package.use.mask 
b/profiles/arch/alpha/package.use.mask
index bf22886900d0..dbe79219b8b2 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <[email protected]> (2021-12-30)
@@ -283,12 +283,6 @@ net-libs/gnutls test-full
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset
 
-# Robin H. Johnson <[email protected]> (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.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
 # Tobias Klausmann <[email protected]> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
 >=sys-devel/gcc-6 ssp

diff --git a/profiles/arch/hppa/package.use.mask 
b/profiles/arch/hppa/package.use.mask
index f438ef894cc3..3071bbb0f102 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
@@ -235,12 +235,6 @@ app-forensics/sleuthkit java
 # Requires USE=seccomp that is masked in this profile.
 net-libs/gnutls test-full
 
-# Robin H. Johnson <[email protected]> (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.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
 # Michał Górny <[email protected]> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
 # no point in pursuing it right now.

diff --git a/profiles/arch/ia64/package.use.mask 
b/profiles/arch/ia64/package.use.mask
index f7d836375ea4..d739b62aacb1 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Vadim Misbakh-Soloviov <[email protected]> (2021-12-09)
@@ -264,12 +264,6 @@ media-video/ffmpeg libv4l
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset
 
-# Robin H. Johnson <[email protected]> (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.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
 # Sergei Trofimovich <[email protected]> (2017-07-20)
 # pulls in unkeyworded java
 sci-libs/gdal mdb

diff --git a/profiles/arch/s390/package.use.mask 
b/profiles/arch/s390/package.use.mask
index 3c5a79ed8553..0fc4971c703e 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <[email protected]> (2021-11-05)
@@ -35,11 +35,6 @@ app-arch/rpm test
 # no ceph keyworded
 net-analyzer/rrdtool rados
 
-# Robin H. Johnson <[email protected]> (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
-
 # Lars Wendler <[email protected]> (2016-11-17)
 # jit not supported on s390
 dev-libs/libpcre2 jit

diff --git a/profiles/arch/s390/s390x/package.use.mask 
b/profiles/arch/s390/s390x/package.use.mask
index 9d4593ef4b49..9af431104cb5 100644
--- a/profiles/arch/s390/s390x/package.use.mask
+++ b/profiles/arch/s390/s390x/package.use.mask
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <[email protected]> (2021-02-05)
 # libpcre2 has JIT support for s390x (not s390)
 # but it doesn't seem to build right now?
 dev-libs/libpcre2 jit
-dev-vcs/git pcre-jit

diff --git a/profiles/arch/sparc/64ul/package.use.mask 
b/profiles/arch/sparc/64ul/package.use.mask
index 343cd157d4d4..cdda3cd66f3b 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <[email protected]> (2021-03-20)
@@ -6,11 +6,6 @@
 # in for grep -P. Debian completely disable it too.
 dev-libs/libpcre jit
 
-# Matt Turner <[email protected]> (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-2.31.0 pcre-jit
-
 # Matt Turner <[email protected]> (2019-08-26)
 # jit not supported on sparc64
 dev-libs/libpcre2 jit

diff --git a/profiles/features/hardened/package.use.mask 
b/profiles/features/hardened/package.use.mask
index 484dafd701c0..fd48a16c7817 100644
--- a/profiles/features/hardened/package.use.mask
+++ b/profiles/features/hardened/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 sys-apps/hwloc gl
@@ -12,6 +12,3 @@ www-client/firefox gmp-autoupdate
 # net-fs/openafs-kernel module can't be used on hardened,
 # see bug 540196.
 net-fs/openafs modules
-
-# jit don't work on hardened.
-dev-vcs/git pcre-jit

Reply via email to