4 files changed, 35 insertions, 273 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 8c1e02e939ae..2d504d48d3a6 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.54 2015/07/07 20:19:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.55 2015/07/24 18:48:39 xarthisius Exp $
+
+*docker-1.7.1 (24 Jul 2015)
+
+  24 Jul 2015; Kacper Kowalik <xarthisius@gentoo.org> +docker-1.7.1.ebuild,
+  -docker-1.7.0-r1.ebuild, -docker-1.7.0.ebuild:
+  Version bump, grabbed from tianon's docker overlay. Fixes #554306. Drop old
 
 *docker-1.7.0-r1 (07 Jul 2015)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 91a85be7d3ee..2d912dae355a 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -10,17 +10,26 @@ AUX docker.initd 883 SHA256 578713158150ecf246b1a2a039191c7a15537c851e0bcdedc5ce
 AUX docker.service 285 SHA256 848c73b11cfd0071076b7119bc4a45db83d7abfb8b1ff3ba571c0dffc5d50071 SHA512 63e3b10d3af77254e0b78eae80386247ad4ffb2b4a3a3843b635121ae42ad4a313a0e589ec420a9bd4ddbea35d7f5eea04de82b565e30d42989abbd1f9b2a930 WHIRLPOOL a95de86ac6a6a5000bbd37be43a4344e0e9b3115e4d5dd1a0e68517ea4d1df1f87aa3fbf5e095b2a6aa0c081ee512019d8c9a9d52abadf6d46cc492149249caa
 DIST docker-1.6.1.tar.gz 5713944 SHA256 aa3534277d11b32bc3564b801aeed0502f067317e7e111bd91ce2d989d34c51e SHA512 d2647f191fd295c8a9326e11ddbf6e77f33b70f14e3ebd37db3c9fa1f4946e0e3f426078ee847f52d7c57fc7783d26afe3e5d2e7ff17d8e6bb4f71609e8f5ef2 WHIRLPOOL e12c799ef63a0646f7393b00b6c1e200f350f7089445c58819ae5b53d66d18d985cb9f8fde1cd3ecfa55c2f0186064fc7080b7ebba132404aa15502029881602
 DIST docker-1.6.2.tar.gz 5714121 SHA256 f3a031b23ea9ff0fdbf3ffb9449c64ec51bb053491b47b28000eb4cce9f23203 SHA512 c27bdafabcb8ad2e49bee9e1529141a25596ba2b59435fb9368fc406950d0d7d1cbd876f1f4248dfc7089a22b8a2d13009dd164bde87e37b95a8e502bb49cac9 WHIRLPOOL aea4105ba30104d751203153b6208e363ce0abb3145ee134e675c4bc640e888afb281e7ba9009a30b9af37e829185684427a33b947d8710b49562e3352526c06
-DIST docker-1.7.0.tar.gz 6840221 SHA256 69f38c8ef69444f23e9ff25058c48a473a8025a911af668f913773deac9e1219 SHA512 c150751f06ebb19576e1ad3aeda8e3df195f8aaa141b612c42a23b8b0e2627e5c9caa2f317dbc622a5af0db6b8d058351ccd2dd3e3b9cc00b1f177c05fe578aa WHIRLPOOL 800430cb077daab3c11362cc1c9749a923c427d2c9dbe83dada12e35d1bfd014c5502a02418af9ac6a2a91e16fe564b2f28ad2ef2e6a502a31a0808e7b99ea12
+DIST docker-1.7.1.tar.gz 6853527 SHA256 9cd26415d68a88d3cf576e7e78c2fe97f42af795404f552728acc5b41dccf4ef SHA512 9b32c3deab77a27a4322a3ccbb3759a2c2a5627605090c4517c3754e6821407abcf5ffa227bad1fdafcbba068cdcaab586015dd8cfe9aed7e8a221d0615463f1 WHIRLPOOL 41b1afd8ea08c3452e5658d73e85c3b79a64f85fb4cb99c4c6a2ce1ab49836cebbe14724afe47898cb8d9bb9d4d69c64ff1c061895f3b9534150bc7ab50e2b22
 EBUILD docker-1.6.1.ebuild 6989 SHA256 c4ee05783aa758c88d04f446e41cce27ea966eb6ce4cf1f0eb58101c59fde242 SHA512 b2242d3e3b3a71b77faa6b7404f032d8b3e49262bb056471b10286780fd2deb8f3dce6def5cc3a9307f9a663260ada855fd01dfc1ea023f92041d118d72de790 WHIRLPOOL cc93426aac944d27c092942a440c3ae521c31b6d27688f9df903ca728c967714adf5d1805780301358c528f95901d25a47751ba713bd54b8c53a307c9479c574
 EBUILD docker-1.6.2.ebuild 6985 SHA256 45004bcf8d09923c3750df6f008b22622860718988552f2539389070c7863c12 SHA512 31852697327a7b77060c1ca7715c4c4271f262f42f96d9fc55dc6123432d5c740d058f9ce92d190f5fe2973d40d1ea77d5c53769a90a26c89356dba78832ca19 WHIRLPOOL c877065d68df776b65e16fa36e8eab5bf8d057bf5f07ffe2cf04b93384a21a43a4e4690fd03fafd9235a76757c82345412fefe2c0a3359025afba17636c4bb8d
-EBUILD docker-1.7.0-r1.ebuild 7248 SHA256 5c3ec151d31a1d7e887f8a15d27ed81f148be6ff1ac66c96b081494cc360115a SHA512 22919e5ced21289ccd72500dc68cf9683f1dc36952988bf48b3eb8028188879bcf911b630c03aa411d71d0cc5c9773767abcad996082c419afc4690ce0986610 WHIRLPOOL a5d751d5b12fe263b29049f78fb2ac9c561bdbdd498163b315c3ebfdf793b9fdfcb2ed7de3cff4b924e86e0f658c969e32bb1ed39bac2312cfbfa584841594e3
-EBUILD docker-1.7.0.ebuild 7240 SHA256 b83accc584a79e2f176445b371bcc1c897151cbbeaba211ac50bca58a880a874 SHA512 47e81e16e8df885a205951cd0b1d81bb440e42e88f1c281ec856eb9559d7173ff76a2cfae76cd513226c8b095895228eb5da8b57fd0c2748eec5f706d61eb1e5 WHIRLPOOL 9e8b7dca813e7a95505f1d21a07cb313e4d939796c8dcc651d844d36be56fc595e20ba7fb577b60de7138a06c05417087480ab6e4a790c52286286586fbfcefe
-MISC ChangeLog 8854 SHA256 86452f2541e69b3a23e6346382a8823a4ccc4c6b5c00b0fe44264d7013ac3c68 SHA512 3d64a96650e940f81961554c64121751bad0d70122654a17702f11c885af91084b50f979f701356738a4d06ad74ede77e97c9cbdde8385229ca090dcf2e2e62a WHIRLPOOL 037d3e7add8992e1fbbd2d6b974d57d619909b6ed1124aa3a62d2ffada0f13f5d7b4cc292edfe2386328707163f4b08fe435c2af1546428eeb643a356b14d52c
+EBUILD docker-1.7.1.ebuild 7349 SHA256 463394782a221fb89d99b34fd51ad40bf68f3e7261f42c02f7daf99309c353cd SHA512 a4bede05d6d4d38ee5a41005020a90c3aae5d2c711c091fba544997c6abd8687ad3c3c57d268836a26edc5504746fc0ad7aa0f9a381194930207c000a4c8c489 WHIRLPOOL 82066942ffcaf7cea9cc85c99688d24088ab3ebee4880904e92e71c48a5f07f3098576fa0685474538ff4eec4f1c79d03921538ae93174c35b353fabf0d27219
+MISC ChangeLog 9089 SHA256 0d9d64d58babed26da88c260c5d38721ddadd920617b686b7d4d053bde3a7a2b SHA512 d593b17071b0271951228644b6b96ec40f064e39b6fd146ab28553947c99bcefe8e4ebd9d5937d58cd4ab593e4d903747c72b9f5f6df3f2a83c5a892a859f685 WHIRLPOOL 0d143ca1c8bb2bdc5122a472d05092edd431e7d8b402ae04ae730fa34573c4b0bba7306dde6b4a0b3b1cad2c643010f7b4482005ae30fe1caeaa5c1931b1a7b5
 MISC metadata.xml 1795 SHA256 ed9ef64477285392cbb9b0e4b45b05441d5d55460b31899015770d2afdf64ae6 SHA512 b0d941f5d928fddd6290a1eff22012536c3718e66e371ea711365ee39f8a42e21f2e66ddefb5716e8cfafec018d9e3a277833af54f34933169096ae1ece5833c WHIRLPOOL 2d46322b68db72ea654df78494bf84c1df7fe41fefb269ac9a0357029f3bc670024ce33450c011d71881f2183cab802ac71d3be2988dbd8e741ce5b4ed5cb12e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWcNEUACgkQblQW9DDEZTi2ZgCeJLKw3p9YnMOr1YIVaVvyeJyb
-H4UAoJGkUvb3YcFw7hbzBxNXKtuQaZvJ
-=U8Dj
+iQIcBAEBCAAGBQJVsoiNAAoJEF0huFKJUZL5Z2kP/3kpYBcilcIeGLm2p7kmuUZE
+SNbYJ0kwTwh4RPa06FCfptoGdPa3eu3VHk9yUcknRTgB19dmvdifNZQeBxxjRPRn
+eI62R2lpS+ZdF9qkSnVt7W9k8yAU9uYwVwHzzdd95BaEF3tCfWOobGlaPCawJCr7
+S0/Nf9CapxR1JOaiINZsV28D1/b87lVXD4L7TWOb8hMm7u/bHjJ3Sy2JBECMNstf
+1DZQp/KSsWDAkwRf5h3t6g4O5vPR+PkiXp4buziwH89QRwu8YTGTbBpvo7hw2G6s
+B80uHGpA2fL/8PLN5Wy6WT0sijhQ9PMmmA3mhD1PHX2Y8On6l97FAIK8zzIp8lnl
+sOQZwqdjNKrBYv+c5IWBiwYa0bxxmsRZPD1+a/PPwg8hsU2ASFMgvR4r0fldtHhb
+oOQ03pd7XroZsGIS/K6LSlVGNRIAmt4q4KkdABXdFGWtmSby63ioWzzht3C0cy1T
+cAsZjpyd7swZMZUaL6dN9gNwlfJ44E4LPCWRYOoMF/SnQgOP4ihdhb7pbQ6aCza/
+w3OsusD4ZHXEsaT/GkILbI7YxOLkBpgCClzxixk8VyO5MgoKnfq6GS9OYTHHmhmj
+I5RpCYBC9vng64bf68iuLUJW9k0fKiNKei/gdvyJD3vbwmzXxwJPwRQbcRHxfVLL
+F/ZMeBj4ggak8dkluIbu
+=d2Sq
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker/docker-1.7.0.ebuild b/app-emulation/docker/docker-1.7.0.ebuild
deleted file mode 100644
index d0876058393c..000000000000
--- a/app-emulation/docker/docker-1.7.0.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.7.0.ebuild,v 1.2 2015/07/05 09:52:08 mrueg Exp $
-
-EAPI=5
-
-DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
-HOMEPAGE="https://www.docker.com"
-
-GITHUB_URI="github.com/docker/docker"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="git://${GITHUB_URI}.git"
-	inherit git-2
-else
-	MY_PV="${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	DOCKER_GITCOMMIT="0baf609"
-	KEYWORDS="~amd64"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-fi
-
-inherit bash-completion-r1 linux-info multilib systemd udev user
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +contrib +device-mapper doc experimental lxc overlay vim-syntax"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-"
-
-DEPEND="
-	${CDEPEND}
-	>=dev-lang/go-1.4
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.8
-	)
-"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-
-	!app-emulation/docker-bin
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-
-	lxc? (
-		>=app-emulation/lxc-1.0.7
-	)
-	aufs? (
-		|| (
-			sys-fs/aufs3
-			sys-fs/aufs4
-			sys-kernel/aufs-sources
-		)
-	)
-
-	apparmor? (
-		sys-libs/libapparmor[static-libs]
-	)
-"
-
-RESTRICT="installsources strip"
-
-# 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
-	MACVLAN VETH BRIDGE
-	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
-	NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
-	NF_NAT NF_NAT_NEEDED
-
-	POSIX_MQUEUE
-
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-	~RESOURCE_COUNTERS
-	~CGROUP_PERF
-	~CFS_BANDWIDTH
-"
-
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		eerror ""
-		eerror "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
-		die 'Kernel is too old - need 3.10 or above'
-	fi
-
-	# for where these kernel versions come from, see:
-	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-	if ! {
-		kernel_is ge 3 16 \
-		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
-	}; then
-		ewarn ""
-		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-		ewarn ""
-		ewarn "See also https://github.com/docker/docker/issues/2960"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		# TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
-		# an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# allow user patches (use sparingly - upstream won't support them)
-	epatch_user
-}
-
-src_compile() {
-	# if we treat them right, Docker's build scripts will set up a
-	# reasonable GOPATH for us
-	export AUTO_GOPATH=1
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a zip, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	if gcc-specs-pie; then
-		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-		sed -i "s/LDFLAGS_STATIC_DOCKER='/LDFLAGS_STATIC_DOCKER='-extldflags -fno-PIC /" hack/make/dynbinary || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
-	fi
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	if use apparmor; then
-		DOCKER_BUILDTAGS+=' apparmor'
-	fi
-
-	# https://github.com/docker/docker/pull/13338
-	if use experimental; then
-		export DOCKER_EXPERIMENTAL=1
-	else
-		unset DOCKER_EXPERIMENTAL
-	fi
-
-	# time to build!
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	# TODO get go-md2man and then include the man pages using man/md2man-all.sh
-}
-
-src_install() {
-	VERSION=$(cat VERSION)
-	newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
-	exeinto /usr/libexec/docker
-	newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	if use doc; then
-		# TODO doman man/man*/*
-
-		docompress -x /usr/share/doc/${PF}/md
-		docinto md
-		dodoc -r docs/*
-	fi
-
-	dobashcomp contrib/completion/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r contrib/syntax/vim/ftdetect
-		doins -r contrib/syntax/vim/syntax
-	fi
-
-	if use contrib; then
-		mkdir -p "${D}/usr/share/${PN}/contrib"
-		cp -R contrib/* "${D}/usr/share/${PN}/contrib"
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog ""
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog ""
-
-	# create docker group if the code checking for it in /etc/group exists
-	enewgroup docker
-
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog ""
-}
diff --git a/app-emulation/docker/docker-1.7.0-r1.ebuild b/app-emulation/docker/docker-1.7.1.ebuild
index 2f0c4590907d..6c245c0e59af 100644
--- a/app-emulation/docker/docker-1.7.0-r1.ebuild
+++ b/app-emulation/docker/docker-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.7.0-r1.ebuild,v 1.1 2015/07/07 20:19:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.7.1.ebuild,v 1.1 2015/07/24 18:48:39 xarthisius Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
-	DOCKER_GITCOMMIT="0baf609"
+	DOCKER_GITCOMMIT="786b29d"
 	KEYWORDS="~amd64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 fi
@@ -79,7 +79,7 @@ CONFIG_CHECK="
 	NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
 	DEVPTS_MULTIPLE_INSTANCES
 	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS
-	MACVLAN VETH BRIDGE
+	MACVLAN VETH BRIDGE BRIDGE_NETFILTER
 	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
 	NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
 	NF_NAT NF_NAT_NEEDED
@@ -87,7 +87,9 @@ CONFIG_CHECK="
 	POSIX_MQUEUE
 
 	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-	~RESOURCE_COUNTERS
+
+	~BLK_CGROUP
+	~IOSCHED_CFQ
 	~CGROUP_PERF
 	~CFS_BANDWIDTH
 "
@@ -120,6 +122,12 @@ pkg_setup() {
 		ewarn "See also https://github.com/docker/docker/issues/2960"
 	fi
 
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
 	if use aufs; then
 		CONFIG_CHECK+="
 			~AUFS_FS