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

[William Hubbs]

commit:     ccbdbde873e3f1f2ff9ce4fd0a667a55c4799d91
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 04:00:15 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 04:04:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbdbde8

app-emulation/docker: 1.12.0: clean up kernel checks

Package-Manager: portage-2.2.28

 app-emulation/docker/docker-1.12.0.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker/docker-1.12.0.ebuild 
b/app-emulation/docker/docker-1.12.0.ebuild
index 1b1ed87..9eef62f 100644
--- a/app-emulation/docker/docker-1.12.0.ebuild
+++ b/app-emulation/docker/docker-1.12.0.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