From cfbedc84507006ba9cff71bd9cede4ede8ccf8e2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 24 Mar 2022 20:11:20 -0700 Subject: app-containers/snapd: remove cgroup-hybrid USE flag Closes: https://bugs.gentoo.org/835818 Signed-off-by: Zac Medico --- app-containers/snapd/metadata.xml | 3 --- app-containers/snapd/snapd-2.55.2.ebuild | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'app-containers') 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 @@ Enable AppArmor support. - - Default to hybrid (legacy) cgroup hierarchy instead of unified (modern). - Automatically disable application confinement if feature detection fails. 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]" -- cgit v1.2.3-65-gdbad