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

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

[Mike Gilbert]

commit:     1fe0bb847fc92c345dbcce5e820276716a0fbacd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 15:32:06 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 15:40:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe0bb84

profiles/arch: elaborate on 'apparmor' USE mask

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 profiles/arch/amd64/use.mask       | 3 +++
 profiles/arch/arm64/use.mask       | 3 +++
 profiles/arch/base/use.mask        | 3 +++
 profiles/arch/x86/package.use.mask | 9 ---------
 profiles/arch/x86/use.mask         | 4 ----
 profiles/arch/x86/use.stable.mask  | 6 +-----
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 7e8fbecd25e4..19ac88e44f05 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -40,7 +40,10 @@
 -firebird
 
 # Mike Gilbert <floppym@gentoo.org> (2014-10-19)
+# Requires the following packages to be keyworded/stable:
 # sys-libs/libapparmor
+# sys-apps/apparmor
+# sys-apps/apparmor-utils
 -apparmor
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index e4d3133be075..1aa7b0ba54ab 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -5,7 +5,10 @@
 -arm64
 
 # Mike Gilbert <floppym@gentoo.org> (2022-08-31)
+# Requires the following packages to be keyworded/stable:
 # sys-libs/libapparmor
+# sys-apps/apparmor
+# sys-apps/apparmor-utils
 -apparmor
 
 # David Seifert <soap@gentoo.org> (2022-03-13)

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 8c35c3fc8a27..499c69aadc54 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -208,7 +208,10 @@ sbcl
 systemd
 
 # Mike Gilbert <floppym@gentoo.org> (2014-10-19)
+# Requires the following packages to be keyworded/stable:
 # sys-libs/libapparmor
+# sys-apps/apparmor
+# sys-apps/apparmor-utils
 apparmor
 
 # Mask flags that correspond to all possible ARCH values.

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 2b94caf6bae8..588a4257a3c8 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -43,10 +43,6 @@ media-video/ffmpeg amf
 # Only supports cpu_flags_x86_aes in 64-bit mode
 net-fs/samba cpu_flags_x86_aes
 
-# Conrad Kostecki <conikost@gentoo.org> (2021-11-16)
-# AppArmor is not available on x86
-app-benchmarks/stress-ng apparmor
-
 # James Le Cuirot <chewi@gentoo.org> (2021-10-22)
 # The JIT feature only works on amd64 and x86.
 app-emulation/fs-uae -jit
@@ -150,11 +146,6 @@ dev-python/influxdb test
 # clisp is keyworded on x86
 app-text/texlive-core -xindy
 
-# Joonas Niilola <juippis@gentoo.org> (2020-05-14)
-# sys-apps/apparmor not keyworded on x86.
-app-containers/lxc apparmor
-app-containers/lxd apparmor
-
 # Georgy Yakovlev <gyakovlev@gentoo.org (2020-04-26)
 # static-pie works on x86, #719444
 sys-libs/glibc -static-pie

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index a221468a59a2..fefef575af00 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -34,10 +34,6 @@
 # dev-db/firebird is keyworded ~x86
 -firebird
 
-# Mike Gilbert <floppym@gentoo.org (2014-10-19)
-# sys-libs/libapparmor
--apparmor
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
 -python_targets_pypy3

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 58b15063cd35..093b69d79a82 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.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
 
 # This file requires eapi 5 or later. New entries go on top.
@@ -18,10 +18,6 @@ mkl
 # dev-db/firebird is keyworded ~x86
 firebird
 
-# Mike Gilbert <floppym@gentoo.org> (2014-10-19)
-# sys-libs/libapparmor
-apparmor
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
 python_targets_pypy3