app-emulation/docker: sync live ebuild

Package-Manager: portage-2.2.28

diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
index 9f78ea58ede976af4c6a853d0c184463f61c1a93..aff078a5804b3846ccc130ddc55952d6b2a12f7f 100644 (file)
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -70,13 +70,12 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
 # see "contrib/check-config.sh" from upstream's sources
 CONFIG_CHECK="
        ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-       ~DEVPTS_MULTIPLE_INSTANCES
        ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
        ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
        ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE
        ~IP_VS ~IP_VS_RR
        ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-       ~NETFILTER_XT_MATCH_IVPS
+       ~NETFILTER_XT_MATCH_IPVS
        ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT
        ~NF_NAT ~NF_NAT_NEEDED
 
@@ -148,6 +147,12 @@ pkg_setup() {
                ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
        fi
 
+       if kernel_is lt 4 7; then
+               CONFIG_CHECK+="
+                       ~DEVPTS_MULTIPLE_INSTANCES
+               "
+       fi
+
        if use aufs; then
                CONFIG_CHECK+="
                        ~AUFS_FS