diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild
index 1895fedb40..7f0bef0c6b 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.1.6-r1.ebuild
@@ -33,4 +33,5 @@ src_install() {
sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \
"${FILESDIR}"/etcd-member.service > ${T}/etcd-member.service
systemd_dounit ${T}/etcd-member.service
+ systemd_dotmpfilesd "${FILESDIR}"/etcd-wrapper.conf
}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.conf
similarity index 50%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.conf
index 721e9c9161..5918e37711 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.conf
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper.conf
@@ -1,2 +1 @@
d /var/lib/etcd 0755 etcd etcd - -
-d /var/run/etcd 0755 etcd etcd - -
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r278.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r279.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r278.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r279.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
index 20d4214af9..ccbd74485e 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://coreos.com"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
-IUSE="etcd_protocols_1 etcd_protocols_2 selinux"
+IUSE="selinux"
################################################################################
@@ -65,20 +65,6 @@ IUSE="etcd_protocols_1 etcd_protocols_2 selinux"
RDEPEND=">=sys-apps/baselayout-3.0.0"
-# Select between versions of etcd
-# If protocol 1 is installed it must be configured to provide the default
-# implementation based on whether protocol 2 is enabled or not.
-RDEPEND="${RDEPEND}
- etcd_protocols_1? (
- dev-db/etcd:1
- !etcd_protocols_2? ( dev-db/etcdctl )
- )
- etcd_protocols_2? (
- dev-db/etcd:2
- app-admin/etcd-wrapper
- )
- "
-
# Optionally enable SELinux and pull in policy for containers
RDEPEND="${RDEPEND}
sys-apps/dbus[selinux?]
@@ -100,6 +86,7 @@ RDEPEND="${RDEPEND}
)"
RDEPEND="${RDEPEND}
+ app-admin/etcd-wrapper
app-admin/fleet
app-admin/locksmith
app-admin/mayday
@@ -123,6 +110,7 @@ RDEPEND="${RDEPEND}
coreos-base/coreos-init
coreos-base/coreos-metadata
coreos-base/update_engine
+ dev-db/etcd:2
dev-util/strace
dev-vcs/git
net-analyzer/nmap
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r3.ebuild
deleted file mode 100644
index 9a8a2696a3..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:$
-#
-
-EAPI=5
-CROS_WORKON_PROJECT="coreos/etcd"
-CROS_WORKON_LOCALNAME="etcd"
-CROS_WORKON_REPO="git://github.com"
-inherit toolchain-funcs cros-workon systemd
-
-if [[ "${PV}" == 9999 ]]; then
- KEYWORDS="~amd64"
-else
- CROS_WORKON_COMMIT="9fa3bea5a22265151f0d5063ce38a79c5b5d0271" # v0.4.9
- KEYWORDS="amd64"
-fi
-
-DESCRIPTION="etcd"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="1"
-
-DEPEND=">=dev-lang/go-1.2:="
-RDEPEND="!dev-db/etcd:0
- !dev-db/etcd-starter"
-
-src_compile() {
- ./build
-}
-
-src_install() {
- dobin "${S}/bin/${PN}"
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
deleted file mode 100644
index 7f92d09f0d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=etcd
-Conflicts=etcd2.service
-
-[Service]
-User=etcd
-PermissionsStartOnly=true
-Environment=ETCD_DATA_DIR=/var/lib/etcd
-Environment=ETCD_NAME=%m
-ExecStart=/usr/bin/etcd
-Restart=always
-RestartSec=10s
-LimitNOFILE=40000
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6-r1.ebuild
deleted file mode 120000
index c934d478e0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-etcdctl-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
deleted file mode 100644
index 42f3c23877..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2013 The CoreOS Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CROS_WORKON_PROJECT="coreos/etcdctl"
-CROS_WORKON_LOCALNAME="etcdctl"
-CROS_WORKON_REPO="git://github.com"
-
-if [[ "${PV}" == 9999 ]]; then
- KEYWORDS="~amd64"
-else
- CROS_WORKON_COMMIT="2fef54f1cbc777f8a440275ce10f0ac65c6e75f6" # v0.4.6
- KEYWORDS="amd64"
-fi
-
-inherit cros-workon
-
-DESCRIPTION="etcd command line client"
-HOMEPAGE="https://github.com/coreos/etcdctl"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.2"
-RDEPEND=""
-
-src_compile() {
- ./build
-}
-
-src_install() {
- dobin ${S}/bin/${PN}
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/metadata.xml
deleted file mode 100644
index 928c517828..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- https://github.com/coreos/etcdctl/issues
- https://github.com/coreos/etcdctl/commits/master
- https://github.com/coreos/etcdctl/blob/master/README.md
- coreos/etcdctl
-
-
- zmedico@gentoo.org
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-0.0.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.1.6-r1
similarity index 85%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-0.0.4
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.1.6-r1
index 6bb9984582..bd3ca811ab 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-0.0.4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/etcd-wrapper-3.1.6-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
DESCRIPTION=etcd (System Application Container)
EAPI=6
HOMEPAGE=https://github.com/coreos/etcd
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
RDEPEND=>=app-emulation/rkt-1.9.1[rkt_stage1_fly]
SLOT=0
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=837b16beb1e8ec8448dd7705ea00adde
+_md5_=53aa983d0988234728341120fd800830
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.7.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.7.1
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.7.0-r2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.7.1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.11.8-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.11.8-r1
index 380b96cfe0..4c8f5135fb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.11.8-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.11.8-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f874d6d00c8d95bd693d225e37b658b2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-9999
index fb2a8b85bd..a5eb29fccb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f874d6d00c8d95bd693d225e37b658b2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.4.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.4.2
index dcdbb8a033..8df19e6ea4 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.4.2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.4.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=6ab0119eb267a6a6837c7b4ae41956c6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999
index 55abb37e5d..a2195bf49b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=6ab0119eb267a6a6837c7b4ae41956c6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0
index cb5b2bb167..8c35e89273 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-1.0.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=17368341385b9a2634cf996e07096e20
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-9999
index 215c839a2f..bd6b04612e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=17368341385b9a2634cf996e07096e20
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r2
index e7573cb31d..31e72383f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f9be5b8fc722ade07ef8ee077b6169f6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-9999
index ea9f1f7286..e19446cae3 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f9be5b8fc722ade07ef8ee077b6169f6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r12
similarity index 79%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r11
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r12
index c49059d93c..7d387ebd0a 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r11
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r12
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
RDEPEND=app-emulation/rkt
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=828376ab352f9bc0ac3573f567e94dfa
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=229ba7af409042f18322c7185b3730be
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-9999
index 8c4ea50246..586d4a21bb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
RDEPEND=app-emulation/rkt
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=828376ab352f9bc0ac3573f567e94dfa
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=229ba7af409042f18322c7185b3730be
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.6
index e03cfb5f82..1b9ae7c515 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.6
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=!app-admin/updatectl
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=e6dd7d64b24894bf063d7c185ad003e3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-9999
index a498451521..083e827b25 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=!app-admin/updatectl
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=e6dd7d64b24894bf063d7c185ad003e3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-0.2.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-0.2.2-r1
index dba7b21b8d..d395d238bf 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-0.2.2-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=sys-apps/kmod app-crypt/gnupg sys-apps/systemd
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=d19b7cf74a34bcb5e60b8c68f6e9187e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-9999
index 30c38f2d33..fd1b1373e6 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/acbuild-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=sys-apps/kmod app-crypt/gnupg sys-apps/systemd
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=d19b7cf74a34bcb5e60b8c68f6e9187e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1-r1
index fbd9a1ad1a..ccfff334ba 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f0f83c5041dace50483122a72038374a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-9999
index 1baf5bcf59..6a1a6d2b6f 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f0f83c5041dace50483122a72038374a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.5-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.5-r2
similarity index 84%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.5-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.5-r2
index 146679bee7..3096b81d12 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.5-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/containerd-0.2.5-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install prepare unpack
-DEPEND=dev-lang/go:1.6= virtual/pkgconfig
+DEPEND=dev-lang/go:1.7= virtual/pkgconfig
DESCRIPTION=A daemon to control runC
EAPI=5
HOMEPAGE=https://containerd.tools
-IUSE=seccomp +go_version_go1_6
+IUSE=seccomp +go_version_go1_7
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
RDEPEND=app-emulation/runc seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=go_version_go1_6
+REQUIRED_USE=go_version_go1_7
SLOT=0
SRC_URI=https:///archive/v0.2.5.tar.gz -> containerd-0.2.5.tar.gz
_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=55ec378f1ce029877826eeb5082641dd
+_md5_=795daced73b0a9f500656f97e36e7cb5
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r3
similarity index 87%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r3
index 43c7428844..4688fef71d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.12.6-r3
@@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs +btrfs contrib +device-mapper experimental +overlay seccomp +selinux vim-syntax zsh-completion +journald cros_workon_tree_* profiling +go_version_go1_6
KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) journald? ( >=sys-apps/systemd-225 ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=sys-apps/shadow-4.4 =app-emulation/containerd-0.2.5-r1[seccomp?] =app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?]
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1[static-libs] ) journald? ( >=sys-apps/systemd-225 ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >=sys-apps/shadow-4.4 =app-emulation/containerd-0.2.5-r2[seccomp?] =app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?]
REQUIRED_USE=go_version_go1_6
RESTRICT=installsources strip
SLOT=0
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6106070f23404b739a7d84b4ebcb2b0d
+_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7c3e205941a88f94ef432c19b37cf2e6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.04.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.04.0-r1
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.04.0
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.04.0-r1
index 7249590ed9..d12181fb43 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.04.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-17.04.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
REQUIRED_USE=go_version_go1_7
RESTRICT=installsources strip
SLOT=0
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=edf26d0c62989a628f7ab5158c149314
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999
index fc263be8d4..d853a0d043 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
REQUIRED_USE=go_version_go1_7
RESTRICT=installsources strip
SLOT=0
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=edf26d0c62989a628f7ab5158c149314
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-engine-20161212 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-engine-20170327
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-engine-20161212
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-engine-20170327
index e7cc8a8062..1409dc39ce 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-engine-20161212
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-engine-20170327
@@ -7,6 +7,6 @@ KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=app-admin/sudo dev-python/boto dev-python/setuptools sys-apps/ethtool sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/shadow
SLOT=0
-SRC_URI=https://github.com/GoogleCloudPlatform/compute-image-packages/archive/20161212.tar.gz
+SRC_URI=https://github.com/GoogleCloudPlatform/compute-image-packages/archive/20170327.tar.gz
_eclasses_=eutils ea170b525f6a38a006be05c9d9429f13 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=41cf6824238e678cfba45f9f96a00602
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-1.25.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-1.25.0-r1
index 9a6061c98f..495c54e0ea 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-1.25.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-1.25.0-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/rocket rkt_stage1_host? ( ~sys-apps/systemd-222 app-shell
REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_src ) go_version_go1_7
SLOT=0
SRC_URI=rkt_stage1_coreos? ( amd64? ( https://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-amd64-usr-1235.0.0.img ) arm64? ( https://alpha.release.core-os.net/arm64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-arm64-usr-1235.0.0.img ) )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=53203bee72eb593bdeb359c1adc5be53
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-9999
index 7a1db704e6..47c77440fe 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-9999
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/rocket rkt_stage1_host? ( ~sys-apps/systemd-222 app-shell
REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_src ) go_version_go1_7
SLOT=0
SRC_URI=rkt_stage1_coreos? ( amd64? ( https://alpha.release.core-os.net/amd64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-amd64-usr-1235.0.0.img ) arm64? ( https://alpha.release.core-os.net/arm64-usr/1235.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-arm64-usr-1235.0.0.img ) )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=53203bee72eb593bdeb359c1adc5be53
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1
index 784ff980d4..124fe7d365 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
DESCRIPTION=CoreOS (meta package)
EAPI=2
HOMEPAGE=http://coreos.com
-IUSE=etcd_protocols_1 etcd_protocols_2 selinux
+IUSE=selinux
KEYWORDS=amd64 arm arm64 x86
LICENSE=GPL-2
-RDEPEND=>=sys-apps/baselayout-3.0.0 etcd_protocols_1? ( dev-db/etcd:1 !etcd_protocols_2? ( dev-db/etcdctl ) ) etcd_protocols_2? ( dev-db/etcd:2 amd64? ( app-admin/etcd-wrapper ) ) sys-apps/dbus[selinux?] sys-apps/systemd[selinux?] selinux? ( sec-policy/selinux-virt ) amd64? ( app-admin/kubelet-wrapper app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd app-admin/flannel-wrapper ) app-admin/fleet app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim app-emulation/docker app-emulation/rkt app-emulation/actool app-misc/ca-certificates app-misc/jq app-shells/bash coreos-base/coreos-cloudinit coreos-base/coreos-init coreos-base/coreos-metadata coreos-base/update_engine dev-util/strace dev-vcs/git net-analyzer/nmap net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/wget net-misc/whois sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/findutils sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/lshw sys-apps/net-tools sys-apps/nvme-cli sys-apps/pciutils sys-apps/rng-tools sys-apps/sed sys-apps/seismograph sys-apps/shadow sys-apps/usbutils sys-apps/util-linux sys-apps/which sys-block/open-iscsi sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/multipath-tools sys-fs/quota sys-fs/xfsprogs sys-kernel/coreos-firmware sys-kernel/coreos-kernel sys-libs/glibc sys-libs/nss-usrfiles sys-libs/timezone-data sys-process/lsof sys-process/procps
+RDEPEND=>=sys-apps/baselayout-3.0.0 sys-apps/dbus[selinux?] sys-apps/systemd[selinux?] selinux? ( sec-policy/selinux-virt ) amd64? ( app-admin/kubelet-wrapper app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd app-admin/flannel-wrapper ) app-admin/etcd-wrapper app-admin/fleet app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim app-emulation/docker app-emulation/rkt app-emulation/actool app-misc/ca-certificates app-misc/jq app-shells/bash coreos-base/coreos-cloudinit coreos-base/coreos-init coreos-base/coreos-metadata coreos-base/update_engine dev-db/etcd:2 dev-util/strace dev-vcs/git net-analyzer/nmap net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/wget net-misc/whois sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/findutils sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/lshw sys-apps/net-tools sys-apps/nvme-cli sys-apps/pciutils sys-apps/rng-tools sys-apps/sed sys-apps/seismograph sys-apps/shadow sys-apps/usbutils sys-apps/util-linux sys-apps/which sys-block/open-iscsi sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/multipath-tools sys-fs/quota sys-fs/xfsprogs sys-kernel/coreos-firmware sys-kernel/coreos-kernel sys-libs/glibc sys-libs/nss-usrfiles sys-libs/timezone-data sys-process/lsof sys-process/procps
SLOT=0
-_md5_=e28d35c02cd5cdac70536ab981d3a35c
+_md5_=62241cf946c94c5fd02705eafa4d9ffc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r277 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r277
deleted file mode 100644
index 784ff980d4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r277
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=CoreOS (meta package)
-EAPI=2
-HOMEPAGE=http://coreos.com
-IUSE=etcd_protocols_1 etcd_protocols_2 selinux
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/baselayout-3.0.0 etcd_protocols_1? ( dev-db/etcd:1 !etcd_protocols_2? ( dev-db/etcdctl ) ) etcd_protocols_2? ( dev-db/etcd:2 amd64? ( app-admin/etcd-wrapper ) ) sys-apps/dbus[selinux?] sys-apps/systemd[selinux?] selinux? ( sec-policy/selinux-virt ) amd64? ( app-admin/kubelet-wrapper app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd app-admin/flannel-wrapper ) app-admin/fleet app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim app-emulation/docker app-emulation/rkt app-emulation/actool app-misc/ca-certificates app-misc/jq app-shells/bash coreos-base/coreos-cloudinit coreos-base/coreos-init coreos-base/coreos-metadata coreos-base/update_engine dev-util/strace dev-vcs/git net-analyzer/nmap net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/wget net-misc/whois sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/findutils sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/lshw sys-apps/net-tools sys-apps/nvme-cli sys-apps/pciutils sys-apps/rng-tools sys-apps/sed sys-apps/seismograph sys-apps/shadow sys-apps/usbutils sys-apps/util-linux sys-apps/which sys-block/open-iscsi sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/multipath-tools sys-fs/quota sys-fs/xfsprogs sys-kernel/coreos-firmware sys-kernel/coreos-kernel sys-libs/glibc sys-libs/nss-usrfiles sys-libs/timezone-data sys-process/lsof sys-process/procps
-SLOT=0
-_md5_=e28d35c02cd5cdac70536ab981d3a35c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r279 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r279
new file mode 100644
index 0000000000..124fe7d365
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r279
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=CoreOS (meta package)
+EAPI=2
+HOMEPAGE=http://coreos.com
+IUSE=selinux
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/baselayout-3.0.0 sys-apps/dbus[selinux?] sys-apps/systemd[selinux?] selinux? ( sec-policy/selinux-virt ) amd64? ( app-admin/kubelet-wrapper app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd app-admin/flannel-wrapper ) app-admin/etcd-wrapper app-admin/fleet app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim app-emulation/docker app-emulation/rkt app-emulation/actool app-misc/ca-certificates app-misc/jq app-shells/bash coreos-base/coreos-cloudinit coreos-base/coreos-init coreos-base/coreos-metadata coreos-base/update_engine dev-db/etcd:2 dev-util/strace dev-vcs/git net-analyzer/nmap net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/wget net-misc/whois sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/findutils sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/lshw sys-apps/net-tools sys-apps/nvme-cli sys-apps/pciutils sys-apps/rng-tools sys-apps/sed sys-apps/seismograph sys-apps/shadow sys-apps/usbutils sys-apps/util-linux sys-apps/which sys-block/open-iscsi sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/multipath-tools sys-fs/quota sys-fs/xfsprogs sys-kernel/coreos-firmware sys-kernel/coreos-kernel sys-libs/glibc sys-libs/nss-usrfiles sys-libs/timezone-data sys-process/lsof sys-process/procps
+SLOT=0
+_md5_=62241cf946c94c5fd02705eafa4d9ffc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.13.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.13.0-r1
index 96e8e9fc17..9512beec20 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.13.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.13.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=>=sys-apps/shadow-4.1.5.1
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
_md5_=3681cdf28eebcd93e071a4e1098fe3a6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-9999
index b2d5c579b3..e2986fffb2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=>=sys-apps/shadow-4.1.5.1
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
_md5_=3681cdf28eebcd93e071a4e1098fe3a6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r141 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r141
index 98b30b9337..798e3b14af 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r141
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r141
@@ -9,5 +9,5 @@ LICENSE=BSD
RDEPEND=app-emulation/docker net-misc/openssh net-nds/rpcbind !=sys-apps/systemd-207-r5 >=coreos-base/coreos-cloudinit-0.1.2-r5
REQUIRED_USE=symlink-usr
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f1b3d954da54b8dc5117b8f8bfa604bb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999
index bba735f06d..2a72a63019 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
RDEPEND=app-emulation/docker net-misc/openssh net-nds/rpcbind !=sys-apps/systemd-207-r5 >=coreos-base/coreos-cloudinit-0.1.2-r5
REQUIRED_USE=symlink-usr
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f1b3d954da54b8dc5117b8f8bfa604bb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.8.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.8.0-r1
index 634ad89cf1..cf3d20236e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.8.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-0.8.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=6b84dca949ccc43797ba6787f0925fe3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999
index aaf7e3f4fe..bc23354b44 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-metadata-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=6b84dca949ccc43797ba6787f0925fe3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-oem-gce-0.0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-oem-gce-0.0.1-r3
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-oem-gce-0.0.1-r2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-oem-gce-0.0.1-r3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r532 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r532
index fd9ea622ff..a634d742e6 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r532
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r532
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm x86
LICENSE=GPL-2
RDEPEND=cros_host? ( app-emulation/qemu ) app-portage/gentoolkit cros_host? ( app-shells/bash ) !cros_host? ( !chromeos-base/gmerge ) dev-lang/python dev-util/shflags cros_host? ( dev-util/crosutils ) app-crypt/efitools !coreos-base/coreos-installer
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=9588ab1e890a838dd13c567edfcd4ea1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-9999
index dd34011106..8cae410d9d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=cros_host? ( app-emulation/qemu ) app-portage/gentoolkit cros_host? ( app-shells/bash ) !cros_host? ( !chromeos-base/gmerge ) dev-lang/python dev-util/shflags cros_host? ( dev-util/crosutils ) app-crypt/efitools !coreos-base/coreos-installer
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=9588ab1e890a838dd13c567edfcd4ea1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-0.0.1-r210 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-0.0.1-r210
index 6fe039dcc9..59c18941f8 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-0.0.1-r210
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-0.0.1-r210
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm x86
LICENSE=GPL-2
RDEPEND=app-emulation/qemu app-portage/gentoolkit app-shells/bash coreos-base/cros-devutils dev-util/crosutils
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=786121bdbd8c9cbe6f40fae2afeb7231
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-9999
index f80f97800f..d4fcaef172 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-testutils-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=app-emulation/qemu app-portage/gentoolkit app-shells/bash coreos-base/cros-devutils dev-util/crosutils
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=908187b89e7e52349eee4b9ef7b15e6b
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-0.0.1-r576 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-0.0.1-r576
index 7395539dcf..f37ef11e55 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-0.0.1-r576
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-0.0.1-r576
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/python sys-apps/portage
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=07bffcc84d780d75dd957753169bf9a3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-9999
index 060c54ddb5..977617b9a2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/gmerge-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/python sys-apps/portage
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=07bffcc84d780d75dd957753169bf9a3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609
index 323b8bc1b1..a4fcb5f5cd 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 x86
LICENSE=BSD
RDEPEND=dev-libs/glib dev-libs/libevent
SLOT=180609
-_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 scons-utils d42c1726f481bb5812cc2ce1f236db1d toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 scons-utils d42c1726f481bb5812cc2ce1f236db1d toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=59d17cd496f73ed19f46558f2a321d21
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609-r4
index 323b8bc1b1..a4fcb5f5cd 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609-r4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome-180609-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 x86
LICENSE=BSD
RDEPEND=dev-libs/glib dev-libs/libevent
SLOT=180609
-_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 scons-utils d42c1726f481bb5812cc2ce1f236db1d toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 scons-utils d42c1726f481bb5812cc2ce1f236db1d toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=59d17cd496f73ed19f46558f2a321d21
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7-r1
index 767741b88e..70d50a9866 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=5f033e01316562b13f6837d69b2042a8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-9999
index 40ec4db1c4..cdea50899d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=5f033e01316562b13f6837d69b2042a8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20160906-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20170327
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20160906-r2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-gce-20170327
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.3
index 82ff42428d..4904a57cf2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.4.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=BSD
RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:= dev-util/bsdiff net-misc/curl >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs
SLOT=0
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=a845ee89184660cc2f6901af8a441076
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999
index fc720e3293..6021e01364 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key dev-cpp/gflags dev-cpp/glog[gflags] dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf:= dev-util/bsdiff net-misc/curl >=sys-apps/seismograph-2.2.0 sys-fs/e2fsprogs
SLOT=0
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=a845ee89184660cc2f6901af8a441076
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.5.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.5.0
index d294d88a00..84087da4ce 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.5.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.5.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2
RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
REQUIRED_USE=go_version_go1_8
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f56e947b7ca4db16ea8408923343c12e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
index 5815166754..a25147dfba 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2
RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
REQUIRED_USE=go_version_go1_8
SLOT=0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f56e947b7ca4db16ea8408923343c12e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.9-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.9-r3
deleted file mode 100644
index 4e4d2f7488..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.9-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install unpack
-DEPEND=>=dev-lang/go-1.2:= >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
-DESCRIPTION=etcd
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcd:0 !dev-db/etcd-starter
-SLOT=1
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=496639c3f7eac12fbdd5317fb987e0b6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.7-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.7-r1
index cc99c6d22b..f18dee751e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.7-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=!dev-db/etcd:0 !dev-db/etcdctl
REQUIRED_USE=go_version_go1_7
SLOT=2
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=436a872eef2460505eaa7ca3871d4d3c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-9999
index 0968fda964..2772a01a9b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
RDEPEND=!dev-db/etcd:0 !dev-db/etcdctl
REQUIRED_USE=go_version_go1_7
SLOT=2
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=436a872eef2460505eaa7ca3871d4d3c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6-r1
deleted file mode 100644
index dddb06431e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install unpack
-DEPEND=>=dev-lang/go-1.2 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=etcd command line client
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcdctl
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b91f86cfd669f41f99b8d83e395721f9
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-9999
deleted file mode 100644
index c469ab7a15..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install unpack
-DEPEND=>=dev-lang/go-1.2 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=etcd command line client
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcdctl
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b91f86cfd669f41f99b8d83e395721f9
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.7.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.7.5
similarity index 89%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.7.3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.7.5
index 9d486ee275..8ae71c1f03 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.7.3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.7.5
@@ -6,7 +6,7 @@ HOMEPAGE=http://www.golang.org
KEYWORDS=-* amd64 arm64
LICENSE=BSD
RDEPEND=app-eselect/eselect-go
-SLOT=1.7/1.7.3
-SRC_URI=https://storage.googleapis.com/golang/go1.7.3.src.tar.gz
+SLOT=1.7/1.7.5
+SRC_URI=https://storage.googleapis.com/golang/go1.7.5.src.tar.gz
_eclasses_=coreos-go-lang 105184eea70b4c3b41cd32973a806552 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=29f76ceada4828394b60460d3163e657
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289
index 49cd70bba1..8e7920b08d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-0.0.1-r1289
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_fac7e77188abf62a8c29d1aab875e6bc72d892b2 profiling
KEYWORDS=amd64
LICENSE=BSD
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=9e3cc6f5c225982927273794f0acd81d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999
index 129058be7f..893f156439 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/crosutils-9999
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
KEYWORDS=~amd64
LICENSE=BSD
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=85de96d2b95d71d0ee06ed3ec39548ac
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.4.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.4.0
index dae79aa541..f24b0656a9 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.4.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.4.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 x86
LICENSE=GPL-2
RDEPEND=sys-apps/systemd !coreos-base/coreos-base !=sys-apps/gentoo-functions-0.10 cros_host? ( !coreos-base/coreos-init )
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=ed0d3db63ae6bc3b152e19783dab0ebc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-9999
index ad53909878..0bc40fda07 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
RDEPEND=sys-apps/systemd !coreos-base/coreos-base !=sys-apps/gentoo-functions-0.10 cros_host? ( !coreos-base/coreos-init )
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=ed0d3db63ae6bc3b152e19783dab0ebc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.14.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.14.0
index 1d043c274a..486380563f 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.14.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-0.14.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0/0.14.0
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
_md5_=75d628d9d51364db6673749baf6c9e97
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
index 8f758e1fec..8127f6d4cc 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64
LICENSE=Apache-2.0
REQUIRED_USE=go_version_go1_7
SLOT=0/9999
-_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
+_eclasses_=coreos-go 6e6f51e4ecc89ef7c7823a65556bd9d9 coreos-go-depend bbc48df71cd1e48b73083b5c63377751 coreos-go-utils 5e0ac5131161ee8de80f759806fc0de0 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 0498b698e76cdc94930b59a00c73dd9c
_md5_=75d628d9d51364db6673749baf6c9e97
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.3.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.3.3
new file mode 100644
index 0000000000..416eeb37ef
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!build? ( python_targets_pypy? ( virtual/pypy:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( virtual/pypy:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc +ipc linguas_ru +native-extensions selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.3.tar.bz2 https://dev.gentoo.org/~dolsen/releases/portage/portage-2.3.3.tar.bz2
+_eclasses_=distutils-r1 f1707af2d2ad4cf700a9e690de6ed855 eutils ea170b525f6a38a006be05c9d9429f13 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing eb9be4b678c4e71f3f530a767df31912 python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d275302cd06aedef2ba08f81f3104206 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=90bd6e6ed8c7670c59fb47c3639ec2e6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.1
index 563c41095b..8198f1e851 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.2.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm arm64 x86
LICENSE=BSD
RDEPEND=!coreos-base/vboot_reference !sys-apps/rootdev sys-apps/util-linux sys-fs/e2fsprogs
SLOT=0
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=9a03a9f325dfba687c5575ced6061f81
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999
index 7f82ffea97..925fd14034 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
RDEPEND=!coreos-base/vboot_reference !sys-apps/rootdev sys-apps/util-linux sys-fs/e2fsprogs
SLOT=0
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=9a03a9f325dfba687c5575ced6061f81
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-233 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-233-r1
similarity index 97%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-233
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-233-r1
index 10b1ddb724..e5279ec956 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-233
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-233-r1
@@ -10,5 +10,5 @@ PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] policykit
RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] policykit
RDEPEND=>=sys-apps/util-linux-2.27.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype:2= ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !multislot? ( !sys-boot/grub:0 ) nls? ( sys-devel/gettext )
RESTRICT=test
-SLOT=2
+SLOT=2/2.02
SRC_URI=mirror://gnu/unifont/unifont-7.0.05/unifont-7.0.05.pcf.gz truetype? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.34.zip )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 mount-boot 41ed556fa5641393d5323e421c8e5bcf multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d275302cd06aedef2ba08f81f3104206 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7ea6ecff17d373e2b29c56fb3203109
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 mount-boot 41ed556fa5641393d5323e421c8e5bcf multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d275302cd06aedef2ba08f81f3104206 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=77b7875f0ac3b1ecc1ab7928895bcf1a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999
index eecbe4f2f0..3b1ef076ef 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-9999
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )
RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype:2= ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !multislot? ( !sys-boot/grub:0 ) nls? ( sys-devel/gettext )
RESTRICT=test
-SLOT=2
+SLOT=2/9999
SRC_URI=mirror://gnu/unifont/unifont-7.0.05/unifont-7.0.05.pcf.gz truetype? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.34.zip )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 mount-boot 41ed556fa5641393d5323e421c8e5bcf multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d275302cd06aedef2ba08f81f3104206 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b7ea6ecff17d373e2b29c56fb3203109
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 libtool 4890219c51da247200223277f993e054 mount-boot 41ed556fa5641393d5323e421c8e5bcf multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d275302cd06aedef2ba08f81f3104206 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=77b7875f0ac3b1ecc1ab7928895bcf1a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423-r1
index a77e3e4c80..9ddb37d079 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423-r1
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
KEYWORDS=amd64 arm64
LICENSE=BSD
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=7aa3817a532da1c9a57b076fcb60c1dc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-9999
index 8953a6c9c6..912c34527e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-9999
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
KEYWORDS=~amd64 ~arm64
LICENSE=BSD
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=7aa3817a532da1c9a57b076fcb60c1dc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.13
index 40414f062f..38a5b31876 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.13
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.13
@@ -6,5 +6,5 @@ IUSE=cros_workon_tree_* profiling cros-debug
KEYWORDS=amd64 arm arm64 x86
LICENSE=BSD
SLOT=0/0.0.13
-_eclasses_=cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=56523c3d2265adcde481a0d818b36658
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999
index 32b7eebeee..cf107b49d7 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-9999
@@ -6,5 +6,5 @@ IUSE=cros_workon_tree_* profiling cros-debug
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
SLOT=0/9999
-_eclasses_=cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-au f9ae34f03ddcc4a8450e4f603ffef8f8 cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 flag-o-matic f3d2dfb12521ff699df43be5d9a51dc4 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=56523c3d2265adcde481a0d818b36658
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.10.9-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.11.0
similarity index 50%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.10.9-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.11.0
index 21d4f45b45..087e39f845 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.10.9-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.11.0
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.10.9-r1 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20160331-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev =sys-kernel/coreos-sources-4.10.9
+DEPEND==sys-kernel/coreos-modules-4.11.0 app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/sed sys-apps/shadow sys-apps/systemd sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20160331-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev =sys-kernel/coreos-sources-4.11.0
DESCRIPTION=CoreOS Linux kernel
EAPI=5
HOMEPAGE=http://www.kernel.org
KEYWORDS=amd64 arm64
LICENSE=GPL-2 freedist
-RDEPEND==sys-kernel/coreos-modules-4.10.9-r1
+RDEPEND==sys-kernel/coreos-modules-4.11.0
RESTRICT=binchecks strip
-SLOT=0/4.10.9-r1
+SLOT=0/4.11.0
_eclasses_=coreos-kernel a7d8c01479b7bbc753349eaebba79268 eutils ea170b525f6a38a006be05c9d9429f13 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=b531fd02cfd892c89a08def456fd29dd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.10.9-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.11.0
similarity index 92%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.10.9-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.11.0
index 3234496bbe..ea786572bf 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.10.9-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.11.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.10.9
+DEPEND==sys-kernel/coreos-sources-4.11.0
DESCRIPTION=CoreOS Linux kernel modules
EAPI=5
HOMEPAGE=http://www.kernel.org
@@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64
LICENSE=GPL-2 freedist
RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=4.10.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.10.9.xz mirror://kernel/linux/kernel/v4.x/linux-4.10.tar.xz
+SLOT=4.11.0
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz
_eclasses_=eutils ea170b525f6a38a006be05c9d9429f13 kernel-2 e8e266e84046228629e450852397a75d multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d275302cd06aedef2ba08f81f3104206 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4772ab56be646377961d0242c3142df3
+_md5_=0ddd24ae375858f7982c46c4594e9973
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.23.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.23.0
index 2dfa28e357..8cb3823649 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.23.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.23.0
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
KEYWORDS=amd64 arm arm64 x86
LICENSE=LGPL-2.1+
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=636f0a138f4cd8da306b8be4d59dc47f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-9999
index a6e617c8db..dabd7f78c4 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-9999
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=LGPL-2.1+
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=636f0a138f4cd8da306b8be4d59dc47f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r18 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r18
index 3385fd2968..5a63b78804 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r18
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r18
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=a80335361feb277d46292533f9128948
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999
index fd5667f900..d460e64255 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-9999
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
-_eclasses_=cros-workon 995fc284f005294b40380f96f8f96541 eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba eutils ea170b525f6a38a006be05c9d9429f13 git-r3 6efc2d7de07a77bf72c7207b48d0e123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=8cca8346f374fea4f4ae5d9609862690
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use
index b9f4552858..1730b342ee 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.use
@@ -1,8 +1,5 @@
# arm64 use
-# Protocol 1 not supported on arm64.
-coreos-base/coreos -etcd_protocols_1
-
# FIXME: why isn't this set by default???
sys-libs/ncurses unicode
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
index 2244caca68..a405892000 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
@@ -9,12 +9,6 @@
USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_BOOT_FDT_USE"
USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE"
-# Support selecting between different etcd versions. This must be done
-# via use flags because if two versions are installed one must provide
-# the "default" /usr/bin/etcd binary and systemd services.
-USE_EXPAND="${USE_EXPAND} ETCD_PROTOCOLS"
-ETCD_PROTOCOLS="1 2"
-
# Use go_version_* flags to indicate which major version was used.
# For now this is only informational and set by coreos-go.eclass
USE_EXPAND="${USE_EXPAND} GO_VERSION"