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

[William Hubbs]

commit:     5d9b824f9a00dad9aca17d90cf3cf8e69046e0dc
Author:     Tianon Gravi <admwiggin <AT> gmail <DOT> com>
AuthorDate: Tue Sep 27 20:16:45 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 15:51:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9b824f

app-emulation/docker: sync live ebuild with upstream overlay

Resync CONFIG_CHECK with "contrib/check-config.sh" from upstream

 app-emulation/docker/docker-9999.ebuild | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app-emulation/docker/docker-9999.ebuild 
b/app-emulation/docker/docker-9999.ebuild
index aff078a..2d30bb9 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -71,24 +71,29 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
 CONFIG_CHECK="
        ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
        ~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
+       ~KEYS
+       ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+       ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
        ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-       ~NETFILTER_XT_MATCH_IPVS
-       ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT
        ~NF_NAT ~NF_NAT_NEEDED
-
        ~POSIX_MQUEUE
 
+       ~USER_NS
+       ~SECCOMP
+       ~CGROUP_PIDS
        ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 
-       ~BLK_CGROUP ~IOSCHED_CFQ
+       ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
        ~CGROUP_PERF
        ~CGROUP_HUGETLB
        ~NET_CLS_CGROUP
        ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+       ~IP_VS
+
+       ~VXLAN
        ~XFRM_ALGO ~XFRM_USER
+       ~IPVLAN
+       ~MACVLAN ~DUMMY
 "
 
 ERROR_KEYS="CONFIG_KEYS: is mandatory"
@@ -164,6 +169,7 @@ pkg_setup() {
        if use btrfs; then
                CONFIG_CHECK+="
                        ~BTRFS_FS
+                       ~BTRFS_FS_POSIX_ACL
                "
        fi