[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

[Georgy Yakovlev]

commit:     600d08be6cda4d2e2e1d17140d123f969e900823
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 18:03:00 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 18:14:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600d08be

app-emulation/docker: check MEMCG_SWAP_ENABLED only on <linux-5.8

linux commit 2d1c498072de69e2857b849ee197ba2aa7de53a3 removed it

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-emulation/docker/docker-19.03.12.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-emulation/docker/docker-19.03.12.ebuild 
b/app-emulation/docker/docker-19.03.12.ebuild
index c0cea011dfb..dd60b68bdb4 100644
--- a/app-emulation/docker/docker-19.03.12.ebuild
+++ b/app-emulation/docker/docker-19.03.12.ebuild
@@ -82,7 +82,7 @@ CONFIG_CHECK="
        ~USER_NS
        ~SECCOMP
        ~CGROUP_PIDS
-       ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+       ~MEMCG_SWAP
 
        ~BLK_CGROUP ~BLK_DEV_THROTTLING
        ~CGROUP_PERF
@@ -158,6 +158,12 @@ pkg_setup() {
                "
        fi
 
+       if kernel_is lt 5 8; then
+               CONFIG_CHECK+="
+                       ~MEMCG_SWAP_ENABLED
+               "
+       fi
+
        if use aufs; then
                CONFIG_CHECK+="
                        ~AUFS_FS