[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/arch/base/, profiles/arch/sparc/, ...

[Matt Turner]

commit:     fc2a852220185e40aacf6e1e0f72b3301a81b050
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 19:24:48 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 19:32:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2a8522

profiles: Generalize USE=tpm masks

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 profiles/arch/alpha/package.use.mask         | 4 ----
 profiles/arch/alpha/use.mask                 | 4 ++++
 profiles/arch/amd64/package.use.mask         | 4 ----
 profiles/arch/arm/package.use.mask           | 4 ----
 profiles/arch/arm64/package.use.mask         | 4 ----
 profiles/arch/base/package.use.mask          | 4 ----
 profiles/arch/hppa/package.use.mask          | 4 ----
 profiles/arch/hppa/use.mask                  | 4 ++++
 profiles/arch/ia64/package.use.mask          | 4 ----
 profiles/arch/ia64/use.mask                  | 4 ++++
 profiles/arch/powerpc/ppc32/package.use.mask | 4 ----
 profiles/arch/powerpc/ppc32/use.mask         | 4 ++++
 profiles/arch/powerpc/ppc64/package.use.mask | 4 ----
 profiles/arch/sparc/package.use.mask         | 4 ----
 profiles/arch/sparc/use.mask                 | 4 ++++
 profiles/arch/x86/package.use.mask           | 4 ----
 16 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index c985051a75e2..48b0a30558f5 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -6,10 +6,6 @@
 # It is unusable, for now, in other arches
 media-video/ffmpeg amf
 
-# Sam James <sam@g.o> (2022-02-10)
-# app-crypt/tpm2-tss is not keyworded here
-app-crypt/gnupg tpm
-
 # Sam James <sam@g.o> (2022-01-29)
 # app-text/ronn-ng not keyworded here, bug #801103
 app-accessibility/espeak-ng man

diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index e2fa17de5ef5..1b79bcff211d 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Matt Turner <mattst88@g.o> (2022-02-21)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
 # James Le Cuirot <chewi@g.o> (2021-08-10)
 # media-video/pipewire is not keyworded. Bug #807616.
 pipewire

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 72750d69bf00..86214033c737 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -47,10 +47,6 @@ dev-util/diffoscope -haskell
 x11-base/xwayland -video_cards_nvidia
 x11-wm/mutter -video_cards_nvidia
 
-# Mike Gilbert <floppym@g.o> (2021-03-29)
-# Unmask TPM on supported archs.
-sys-apps/systemd -tpm
-
 # Michael Orlitzky <mjo@g.o> (2021-03-27)
 # Unmask the use of 64-bit dev-lisp/clozurecl on 64-bit arches.
 # Only maxima makes a distinction between the 32-bit and 64-bit

diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 364bde4349c1..8f2a404dc705 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -49,10 +49,6 @@ media-sound/easyeffects zamaudio
 # no stable virtual/jdk on this arch
 media-libs/rubberband jni
 
-# Mike Gilbert <floppym@g.o> (2021-03-29)
-# Unmask TPM on supported archs.
-sys-apps/systemd -tpm
-
 # Sam James <sam@g.o> (2021-02-17)
 # Unmask dev-libs/libpcre2[jit] support on PHP
 # where available

diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 162cb7a46a7c..36118e80a9b9 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -64,10 +64,6 @@ media-sound/easyeffects zamaudio
 # Note: libpng-compat 1.5.30 does NOT seem to.
 media-libs/libpng -cpu_flags_arm_neon
 
-# Mike Gilbert <floppym@g.o> (2021-03-29)
-# Unmask TPM on supported archs.
-sys-apps/systemd -tpm
-
 # Sam James <sam@g.o> (2021-03-20)
 # Supports both 'neon32' and 'neon64'
 sys-libs/zlib-ng -cpu_flags_arm_neon

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index cf2300a6e1a1..08d4b04814e9 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -39,10 +39,6 @@ x11-wm/mutter video_cards_nvidia
 # Has unpackaged depdencies, bug #795459
 >=media-libs/opencolorio-2.0.0 doc
 
-# Mike Gilbert <floppym@g.o> (2021-03-29)
-# TPM only exists on some archs.
-sys-apps/systemd tpm
-
 # Michael Orlitzky <mjo@g.o> (2021-03-27)
 # The clozurecl and clozurecl64 flags are now arch-specific in maxima,
 # so we mask them both by default beginning with v5.44.0-r5 where

diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 6f919ffb1c90..7620037f991f 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -9,10 +9,6 @@
 # It is unusable, for now, in other arches
 media-video/ffmpeg amf
 
-# Sam James <sam@g.o> (2022-02-10)
-# app-crypt/tpm2-tss is not keyworded here
-app-crypt/gnupg tpm
-
 # Arthur Zamarin <arthurzam@g.o> (2022-02-08)
 # bash becomes corrupted and system breaks, bug #832946
 app-shells/bash mem-scramble

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index df9f8769d2c4..b1b7a4ec5a06 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Matt Turner <mattst88gentoo.org> (2022-02-21)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
 # Sam James <sam@g.o> (2021-10-16)
 # media-libs/openexr is not keyworded.
 openexr

diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 23fb24163308..0285d16d0270 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -6,10 +6,6 @@
 # It is unusable, for now, in other arches
 media-video/ffmpeg amf
 
-# Sam James <sam@g.o> (2022-02-10)
-# app-crypt/tpm2-tss is not keyworded here
-app-crypt/gnupg tpm
-
 # Sam James <sam@g.o> (2022-01-29)
 # app-text/ronn-ng not keyworded here, bug #801103
 app-accessibility/espeak-ng man

diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index f70979b1bdfb..cb12b3ba544f 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ia64
 
+# Matt Turner <mattst88@g.o> (2022-02-21)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
 # James Le Cuirot <chewi@g.o> (2021-08-10)
 # media-video/pipewire is not keyworded. Bug #807616.
 pipewire

diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 907f90768a6f..14c6d9fada43 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@g.o> (2022-02-10)
-# app-crypt/tpm2-tss is not keyworded here
-app-crypt/gnupg tpm
-
 # Joonas Niilola <juippis@g.o> (2022-01-04)
 # Dependency not keyworded on this arch.
 dev-libs/efl heif

diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 9fa17ddad41c..5660bdaa645d 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ppc
 
+# Matt Turner <mattst88@g.o> (2022-02-21)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
 # Sam James <sam@g.o> (2021-12-07)
 # net-libs/gnome-online-accounts is not marked keyworded on ppc
 gnome-online-accounts

diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 7a0bdb803f0e..727cd753c7c0 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -38,10 +38,6 @@ sys-apps/exa man
 # dev-python/django is not keyworded here
 dev-python/diskcache test
 
-# Mike Gilbert <floppym@g.o> (2021-03-29)
-# Unmask TPM on supported archs.
-sys-apps/systemd -tpm
-
 # Georgy Yakovlev <gyakovlev@g.o> (2021-02-25)
 # depends on ring crate, which is not so portable
 # https://github.com/briansmith/ring/issues/389

diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0632616f9ffc..dcafc2dac2b2 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -6,10 +6,6 @@
 # It is unusable, for now, in other arches
 media-video/ffmpeg amf
 
-# Sam James <sam@g.o> (2022-02-10)
-# app-crypt/tpm2-tss is not keyworded here
-app-crypt/gnupg tpm
-
 # Vadim Misbakh-Soloviov <mva@g.o> (2021-12-09)
 # ts-cli requires rust to be built, and rust is unavailable here ATM.
 dev-libs/tree-sitter ts-cli

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index df7171de563b..a88935985b69 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -sparc
 
+# Matt Turner <mattst88@g.o> (2022-02-21)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
 # Sam James <sam@g.o> (2021-10-16)
 # media-libs/openexr doesn't work on BE.
 openexr

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index db25a611d6b1..6be23689caba 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -63,10 +63,6 @@ x11-wm/mutter video_cards_nvidia
 >=app-office/libreoffice-bin-7 java
 >=app-office/libreoffice-bin-debug-7 java
 
-# Mike Gilbert <floppym@g.o> (2021-03-29)
-# Unmask TPM on supported archs.
-sys-apps/systemd -tpm
-
 # Daniel Novomesky <dnovomesky@×××××.com> (2021-02-24)
 # Depends on media-libs/svt-av1, which is unavailable on x86
 media-libs/libavif svt-av1