commit:     cfbedc84507006ba9cff71bd9cede4ede8ccf8e2
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 03:11:20 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 03:13:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfbedc84

app-containers/snapd: remove cgroup-hybrid USE flag

Closes: https://bugs.gentoo.org/835818
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-containers/snapd/metadata.xml        | 3 ---
 app-containers/snapd/snapd-2.55.2.ebuild | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app-containers/snapd/metadata.xml 
b/app-containers/snapd/metadata.xml
index 82446241f723..0109791c93ff 100644
--- a/app-containers/snapd/metadata.xml
+++ b/app-containers/snapd/metadata.xml
@@ -12,9 +12,6 @@
                <flag name="apparmor">
                        Enable AppArmor support.
                </flag>
-               <flag name="cgroup-hybrid">
-                       Default to hybrid (legacy) cgroup hierarchy instead of 
unified (modern).
-               </flag>
                <flag name="forced-devmode">
                        Automatically disable application confinement if 
feature detection fails.
                </flag>

diff --git a/app-containers/snapd/snapd-2.55.2.ebuild 
b/app-containers/snapd/snapd-2.55.2.ebuild
index bf6b2a0a243e..4e8c75f7a53b 100644
--- a/app-containers/snapd/snapd-2.55.2.ebuild
+++ b/app-containers/snapd/snapd-2.55.2.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64"
 
 LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
-IUSE="apparmor +cgroup-hybrid +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor cgroup-hybrid ) systemd"
+IUSE="apparmor +forced-devmode gtk kde systemd"
+REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
 
 CONFIG_CHECK="~CGROUPS
                ~CGROUP_DEVICE
@@ -40,7 +40,7 @@ RDEPEND="
        )
        dev-libs/glib
        virtual/libudev
-       systemd? ( sys-apps/systemd[cgroup-hybrid(+)?] )
+       systemd? ( sys-apps/systemd )
        sys-libs/libcap:=
        sys-fs/squashfs-tools[lzma]"
 

Reply via email to