commit:     adb1aa556b87f4ae99fe7e28de98b6eb261d049c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 16:04:46 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:49:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb1aa55

Convert 'apparmor' to a global USE flag

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

 app-benchmarks/stress-ng/metadata.xml  | 3 ---
 app-containers/containerd/metadata.xml | 1 -
 app-containers/docker/metadata.xml     | 3 ---
 app-containers/lxc/metadata.xml        | 1 -
 app-containers/lxd/metadata.xml        | 3 ---
 app-containers/podman/metadata.xml     | 3 ---
 app-containers/runc/metadata.xml       | 3 ---
 app-containers/snapd/metadata.xml      | 3 ---
 app-emulation/libvirt/metadata.xml     | 1 -
 media-libs/libextractor/metadata.xml   | 1 -
 profiles/use.desc                      | 1 +
 sys-apps/dbus-broker/metadata.xml      | 1 -
 sys-apps/systemd/metadata.xml          | 1 -
 13 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/app-benchmarks/stress-ng/metadata.xml 
b/app-benchmarks/stress-ng/metadata.xml
index 70cc32340938..cf330e398b38 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -13,9 +13,6 @@
                that exercise floating point, integer, bit manipulation and 
control flow
                and over 20 virtual memory stress tests.
        </longdescription>
-       <use>
-               <flag name="apparmor">Add support for AppArmor.</flag>
-       </use>
        <upstream>
                
<bugs-to>https://github.com/ColinIanKing/stress-ng/issues</bugs-to>
                <remote-id type="github">ColinIanKing/stress-ng</remote-id>

diff --git a/app-containers/containerd/metadata.xml 
b/app-containers/containerd/metadata.xml
index 5641ef372193..5d63e8606e99 100644
--- a/app-containers/containerd/metadata.xml
+++ b/app-containers/containerd/metadata.xml
@@ -17,7 +17,6 @@
                <name>Georgy Yakovlev</name>
        </maintainer>
        <use>
-       <flag name="apparmor">Support for AppArmor</flag>
        <flag name="btrfs">Support for BTRFS snapshot driver</flag>
        <flag name="cri">Support for Kubernetes CRI</flag>
        <flag name="device-mapper">Support for device mapper snapshot 
driver</flag>

diff --git a/app-containers/docker/metadata.xml 
b/app-containers/docker/metadata.xml
index bc364de188b5..5f163941881c 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -21,9 +21,6 @@
                        Enables dependencies for the "aufs" graph driver, 
including
                        necessary kernel flags.
                </flag>
-               <flag name="apparmor">
-                       Enable AppArmor support.
-               </flag>
                <flag name="btrfs">
                        Enables dependencies for the "btrfs" graph driver, 
including
                        necessary kernel flags.

diff --git a/app-containers/lxc/metadata.xml b/app-containers/lxc/metadata.xml
index 8c08b596f2e4..2d20f0346cc6 100644
--- a/app-containers/lxc/metadata.xml
+++ b/app-containers/lxc/metadata.xml
@@ -10,7 +10,6 @@
     <name>Gentoo Virtualization Project</name>
   </maintainer>
   <use>
-    <flag name="apparmor">Enable AppArmor support</flag>
     <flag name="io-uring">Enable io_uring support, and use io_uring instead of 
epoll</flag>
     <flag name="tools">Build and install additional command line tools</flag>
   </use>

diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index a666d3414c49..dd209643cdb4 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -9,9 +9,6 @@
     <email>virtualizat...@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
   </maintainer>
-  <use>
-    <flag name="apparmor">Enable AppArmor support</flag>
-  </use>
   <longdescription>
     LXD is a modern, secure and powerful system container and virtual machine 
manager.
 

diff --git a/app-containers/podman/metadata.xml 
b/app-containers/podman/metadata.xml
index 11d7dc7603dc..3a429ae48984 100644
--- a/app-containers/podman/metadata.xml
+++ b/app-containers/podman/metadata.xml
@@ -15,9 +15,6 @@
                and volumes.
        </longdescription>
        <use>
-               <flag name="apparmor">
-                       Enable AppArmor support.
-               </flag>
                <flag name="btrfs">
                        Enables dependencies for the "btrfs" graph driver, 
including
                        necessary kernel flags.

diff --git a/app-containers/runc/metadata.xml b/app-containers/runc/metadata.xml
index d27ad6413b06..76423a903140 100644
--- a/app-containers/runc/metadata.xml
+++ b/app-containers/runc/metadata.xml
@@ -14,9 +14,6 @@
                <name>Georgy Yakovlev</name>
        </maintainer>
        <use>
-               <flag name="apparmor">
-                       Enable AppArmor support.
-               </flag>
                <flag name="kmem">
                        Enable Kernel Memory Accounting.
                </flag>

diff --git a/app-containers/snapd/metadata.xml 
b/app-containers/snapd/metadata.xml
index 0109791c93ff..730665fd01eb 100644
--- a/app-containers/snapd/metadata.xml
+++ b/app-containers/snapd/metadata.xml
@@ -9,9 +9,6 @@
                <remote-id type="github">snapcore/snapd</remote-id>
        </upstream>
        <use>
-               <flag name="apparmor">
-                       Enable AppArmor support.
-               </flag>
                <flag name="forced-devmode">
                        Automatically disable application confinement if 
feature detection fails.
                </flag>

diff --git a/app-emulation/libvirt/metadata.xml 
b/app-emulation/libvirt/metadata.xml
index aa7a5f870674..9784c19f4174 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -52,7 +52,6 @@
                        Support management of VirtualBox virtualisation 
(<pkg>app-emulation/virtualbox</pkg>)
                </flag>
                <!-- Miscellaneous flags -->
-               <flag name="apparmor">Enable AppArmor support</flag>
                <flag name="dtrace">Enable dtrace support via 
<pkg>dev-util/systemtap</pkg></flag>
                <flag name="fuse">Allow LXC to use <pkg>sys-fs/fuse</pkg> for 
mountpoints</flag>
                <flag name="numa">

diff --git a/media-libs/libextractor/metadata.xml 
b/media-libs/libextractor/metadata.xml
index c746a433d520..bcc04da57cce 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <!--maintainer-needed-->
   <use>
-    <flag name="apparmor">Enable apparmor support using 
<pkg>sys-libs/libapparmor</pkg></flag>
     <flag name="archive">Enable archive support using 
<pkg>app-arch/libarchive</pkg></flag>
     <flag name="gsf">Enable OLE2 (MS Office) plug-in support using 
<pkg>gnome-extra/libgsf</pkg></flag>
     <flag name="midi">Enable MIDI support through 
<pkg>media-libs/libsmf</pkg></flag>

diff --git a/profiles/use.desc b/profiles/use.desc
index 6438ef0eab9b..83c3e70d13ce 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -18,6 +18,7 @@ ao - Use libao audio output library for sound playback
 apache2 - Add Apache2 support
 aqua - Include support for the Mac OS X Aqua (Carbon/Cocoa) GUI
 atm - Enable Asynchronous Transfer Mode protocol support
+apparmor - Enable support for the AppArmor application security system
 appindicator - Build in support for notifications using the libindicate or 
libappindicator plugin
 audiofile - Add support for libaudiofile where applicable
 audit - Enable support for Linux audit subsystem using sys-process/audit

diff --git a/sys-apps/dbus-broker/metadata.xml 
b/sys-apps/dbus-broker/metadata.xml
index 38ad8e3af8dd..4c5fa33d8b08 100644
--- a/sys-apps/dbus-broker/metadata.xml
+++ b/sys-apps/dbus-broker/metadata.xml
@@ -6,7 +6,6 @@
                <name>Mike Gilbert</name>
        </maintainer>
        <use>
-               <flag name="apparmor">Enable AppArmor support</flag>
                <flag name="launcher">dbus-daemon compatibility launcher</flag>
        </use>
 </pkgmetadata>

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index d258d4fa7cf8..34a269d81d85 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -9,7 +9,6 @@
                <subslots>Incremented for ABI breaks in libudev or 
libsystemd</subslots>
        </slots>
        <use>
-               <flag name="apparmor">Enable AppArmor support</flag>
                <flag name="audit">Enable support for 
<pkg>sys-process/audit</pkg></flag>
                <flag name="cgroup-hybrid">Default to hybrid (legacy) cgroup 
hierarchy instead of unified (modern).</flag>
                <flag name="curl">Enable support for uploading journals</flag>

Reply via email to