From c7504d67bb88fea3f3d5b1789c2c22d2679b224f Mon Sep 17 00:00:00 2001 From: mischief Date: Mon, 27 Apr 2015 17:04:57 -0700 Subject: [PATCH] app-emulation/docker: turn off contrib, turn on btrfs & overlay again --- .../docker/{docker-1.6.0.ebuild => docker-1.6.0-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.6.0.ebuild => docker-1.6.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.6.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 4b4512af24..cdb2cb1585 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -24,7 +24,7 @@ inherit bash-completion-r1 linux-info multilib systemd udev user cros-workon LICENSE="Apache-2.0" SLOT="0" -IUSE="aufs btrfs +contrib +device-mapper doc lxc overlay vim-syntax zsh-completion" +IUSE="aufs +btrfs contrib +device-mapper doc lxc +overlay vim-syntax zsh-completion" # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies CDEPEND="