diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network
deleted file mode 100644
index e5d48d739b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/50-flannel.network
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-Name=flannel*
-
-[Link]
-Unmanaged=yes
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service
deleted file mode 100644
index 2cf5cd964d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service
+++ /dev/null
@@ -1,55 +0,0 @@
-[Unit]
-Description=Network fabric for containers
-Documentation=https://github.com/coreos/flannel
-After=etcd.service etcd2.service
-Before=docker.service
-
-[Service]
-Type=notify
-Restart=always
-RestartSec=5
-Environment="TMPDIR=/var/tmp/"
-Environment="FLANNEL_VER={{flannel_ver}}"
-Environment="FLANNEL_IMG=quay.io/coreos/flannel"
-Environment="ETCD_SSL_DIR=/etc/ssl/etcd"
-EnvironmentFile=-/run/flannel/options.env
-LimitNOFILE=40000
-LimitNPROC=1048576
-ExecStartPre=/sbin/modprobe ip_tables
-ExecStartPre=/usr/bin/mkdir -p /run/flannel
-ExecStartPre=/usr/bin/mkdir -p ${ETCD_SSL_DIR}
-
-ExecStart=/usr/bin/rkt run --net=host \
- --stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \
- --insecure-options=image \
- --set-env=NOTIFY_SOCKET=/run/systemd/notify \
- --inherit-env=true \
- --volume runsystemd,kind=host,source=/run/systemd,readOnly=false \
- --volume runflannel,kind=host,source=/run/flannel,readOnly=false \
- --volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \
- --volume certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
- --volume resolv,kind=host,source=/etc/resolv.conf,readOnly=true \
- --volume hosts,kind=host,source=/etc/hosts,readOnly=true \
- --mount volume=runsystemd,target=/run/systemd \
- --mount volume=runflannel,target=/run/flannel \
- --mount volume=ssl,target=${ETCD_SSL_DIR} \
- --mount volume=certs,target=/etc/ssl/certs \
- --mount volume=resolv,target=/etc/resolv.conf \
- --mount volume=hosts,target=/etc/hosts \
- ${FLANNEL_IMG}:${FLANNEL_VER} \
- --exec /opt/bin/flanneld \
- -- --ip-masq=true
-
-# Update docker options
-ExecStartPost=/usr/bin/rkt run --net=host \
- --stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \
- --insecure-options=image \
- --volume runvol,kind=host,source=/run,readOnly=false \
- --mount volume=runvol,target=/run \
- ${FLANNEL_IMG}:${FLANNEL_VER} \
- --exec /opt/bin/mk-docker-opts.sh -- -d /run/flannel_docker_opts.env -i
-
-ExecStopPost=/usr/bin/rkt gc --mark-only
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild
deleted file mode 120000
index 98cd0d968f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-flannel-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild
deleted file mode 120000
index 98cd0d968f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-flannel-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
deleted file mode 100644
index e8b6309ff1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ "${PV}" == 9999 ]]; then
- KEYWORDS="~amd64 ~arm64"
-else
- KEYWORDS="amd64 arm64"
-fi
-
-inherit systemd coreos-go-utils
-
-DESCRIPTION="flannel"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-emulation/rkt"
-S="$WORKDIR"
-
-src_install() {
- local arch_tag="$(go_arch)"
- sed "s/{{flannel_ver}}/v${PV}-${arch_tag}/" "${FILESDIR}"/flanneld.service >"${T}"/flanneld.service
- systemd_dounit "${T}"/flanneld.service
-
- insinto /usr/lib/systemd/network
- doins "${FILESDIR}"/50-flannel.network
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/metadata.xml
deleted file mode 100644
index 097975e3ad..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/98-fleet-org.freedesktop.systemd1.rules b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/98-fleet-org.freedesktop.systemd1.rules
deleted file mode 100644
index 92991c8fb8..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/98-fleet-org.freedesktop.systemd1.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-polkit.addRule(function(action, subject) {
- if (action.id.indexOf("org.freedesktop.systemd1.") == 0 &&
- subject.user == "fleet") {
- return polkit.Result.YES;
- }
-});
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service
deleted file mode 100644
index cd3761ff5e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=fleet daemon
-
-After=etcd.service
-After=etcd2.service
-
-Wants=fleet.socket
-After=fleet.socket
-
-[Service]
-User=fleet
-Environment=GOMAXPROCS=1
-ExecStart=/usr/bin/fleetd
-Restart=always
-RestartSec=10s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket
deleted file mode 100644
index c3e6502974..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/fleet.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fleet API Socket
-PartOf=fleet.service
-
-[Socket]
-ListenStream=/var/run/fleet.sock
-SocketMode=0660
-SocketUser=fleet
-SocketGroup=fleet
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/sysusers.d/fleet.conf b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/sysusers.d/fleet.conf
deleted file mode 100644
index b1da6aecf2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/sysusers.d/fleet.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# create fleet user and group
-u fleet 253 - -
-# add core to fleet group
-m core fleet - -
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/tmpfiles.d/fleet.conf b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/tmpfiles.d/fleet.conf
deleted file mode 100644
index 6da9b0b907..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/files/tmpfiles.d/fleet.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/fleet 0750 fleet fleet - -
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8-r1.ebuild
deleted file mode 120000
index 55c730c02e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.8-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-fleet-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
deleted file mode 100644
index e1c1b8dc7e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CROS_WORKON_PROJECT="coreos/fleet"
-CROS_WORKON_LOCALNAME="fleet"
-CROS_WORKON_REPO="git://github.com"
-COREOS_GO_PACKAGE="github.com/coreos/fleet"
-inherit cros-workon coreos-go systemd
-
-if [[ "${PV}" == 9999 ]]; then
- KEYWORDS="~amd64 ~arm64"
-else
- CROS_WORKON_COMMIT="dffd80c5852c45397f37642ab27f1d61a87042b2" # tag v0.11.8
- KEYWORDS="amd64 arm64"
-fi
-
-DESCRIPTION="fleet"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-src_compile() {
- go_build "${COREOS_GO_PACKAGE}/fleetd"
- go_build "${COREOS_GO_PACKAGE}/fleetctl"
-}
-
-src_install() {
- dobin ${GOBIN}/*
- dosym ./fleetd /usr/bin/fleet
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_dounit "${FILESDIR}"/${PN}.socket
- systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/${PN}.conf"
-
- # Grant systemd1 access for fleet user
- insinto /usr/share/polkit-1/rules.d
- doins "${FILESDIR}"/98-fleet-org.freedesktop.systemd1.rules
-
- # Install sysusers.d snippet which adds fleet group and adds core user into it
- insinto /usr/lib/sysusers.d/
- newins "${FILESDIR}"/sysusers.d/${PN}.conf ${PN}.conf
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/metadata.xml
deleted file mode 100644
index a86664824b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- alunduil@gentoo.org
- Alex Brandt
-
-
- code@stefanjunker.de
- Stefan Junker
-
-
-
-
- coreos/fleet
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r154.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r155.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r154.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r155.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
index f2ff1fb5c7..6fd54cfcf4 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -31,7 +31,6 @@ REQUIRED_USE="symlink-usr"
DEPEND="
net-misc/openssh
net-nds/rpcbind
- !
-
-
-
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.6.1-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.6.1-r5
deleted file mode 100644
index fde282f92a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.6.1-r5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=flannel
-EAPI=6
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-RDEPEND=app-emulation/rkt
-SLOT=0
-_eclasses_=coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=3d8aa8e5ee20b663c814a98a7c753a3e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.6.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.6.2-r1
deleted file mode 100644
index fde282f92a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.6.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=flannel
-EAPI=6
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-RDEPEND=app-emulation/rkt
-SLOT=0
-_eclasses_=coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=3d8aa8e5ee20b663c814a98a7c753a3e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-9999
deleted file mode 100644
index 50330acd6a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=flannel
-EAPI=6
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=app-emulation/rkt
-SLOT=0
-_eclasses_=coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=3d8aa8e5ee20b663c814a98a7c753a3e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.9.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.10.0
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.9.1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.10.0
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
deleted file mode 100644
index 1a6b3fedaf..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.11.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go:1.9= virtual/pkgconfig
-DESCRIPTION=fleet
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=cros_workon_tree_* profiling +go_version_go1_9
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-REQUIRED_USE=go_version_go1_9
-SLOT=0
-_eclasses_=coreos-go 1b5f6ac7749b16d9f26b8b2813f6d09c coreos-go-depend 14c6f09b2aaca3f3965f1895f1566f7c coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_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
deleted file mode 100644
index d18098948f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go:1.9= virtual/pkgconfig
-DESCRIPTION=fleet
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=cros_workon_tree_* profiling +go_version_go1_9
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-REQUIRED_USE=go_version_go1_9
-SLOT=0
-_eclasses_=coreos-go 1b5f6ac7749b16d9f26b8b2813f6d09c coreos-go-depend 14c6f09b2aaca3f3965f1895f1566f7c coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=f874d6d00c8d95bd693d225e37b658b2
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 d7db8748d6..8fc4a1b759 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
@@ -5,6 +5,6 @@ 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/adcli app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd ) app-admin/etcd-wrapper app-admin/flannel-wrapper app-admin/fleet app-admin/kubelet-wrapper app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/torcx app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim 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-ssh-keys coreos-base/update_engine dev-db/etcd:2 dev-db/etcdctl dev-util/strace dev-vcs/git net-analyzer/nmap net-analyzer/tcpdump net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-firewall/nftables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/socat 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-cluster/ipvsadm sys-fs/btrfs-progs sys-fs/dosfstools 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/adcli app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd ) app-admin/etcd-wrapper app-admin/flannel-wrapper app-admin/kubelet-wrapper app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/torcx app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim 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-ssh-keys coreos-base/update_engine dev-db/etcdctl dev-util/strace dev-vcs/git net-analyzer/nmap net-analyzer/tcpdump net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-firewall/nftables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/socat 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-cluster/ipvsadm sys-fs/btrfs-progs sys-fs/dosfstools 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_=c2f44b23e757bf59cf4707b139722929
+_md5_=0424ccfb96bd057ce677d76954c90fd2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r289 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r289
deleted file mode 100644
index d7db8748d6..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r289
+++ /dev/null
@@ -1,10 +0,0 @@
-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/adcli app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd ) app-admin/etcd-wrapper app-admin/flannel-wrapper app-admin/fleet app-admin/kubelet-wrapper app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/torcx app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim 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-ssh-keys coreos-base/update_engine dev-db/etcd:2 dev-db/etcdctl dev-util/strace dev-vcs/git net-analyzer/nmap net-analyzer/tcpdump net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-firewall/nftables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/socat 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-cluster/ipvsadm sys-fs/btrfs-progs sys-fs/dosfstools 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_=c2f44b23e757bf59cf4707b139722929
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r290 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r290
new file mode 100644
index 0000000000..8fc4a1b759
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r290
@@ -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/adcli app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore sys-auth/realmd sys-auth/sssd ) app-admin/etcd-wrapper app-admin/flannel-wrapper app-admin/kubelet-wrapper app-admin/locksmith app-admin/mayday app-admin/sdnotify-proxy app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/torcx app-arch/unzip app-arch/zip app-crypt/gnupg app-crypt/tpmpolicy app-editors/vim 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-ssh-keys coreos-base/update_engine dev-db/etcdctl dev-util/strace dev-vcs/git net-analyzer/nmap net-analyzer/tcpdump net-dns/bind-tools net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-firewall/nftables net-fs/nfs-utils net-misc/bridge-utils net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync net-misc/socat 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-cluster/ipvsadm sys-fs/btrfs-progs sys-fs/dosfstools 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_=0424ccfb96bd057ce677d76954c90fd2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r154 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r155
similarity index 51%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r154
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r155
index 7c4e26cac1..f52bcde41c 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r154
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r155
@@ -1,13 +1,13 @@
DEFINED_PHASES=info install unpack
-DEPEND=net-misc/openssh net-nds/rpcbind !=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-lang/python:2.7 ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
DESCRIPTION=Init scripts for CoreOS
EAPI=4
HOMEPAGE=http://www.coreos.com/
IUSE=test symlink-usr cros_workon_tree_* profiling
KEYWORDS=amd64 arm arm64 x86
LICENSE=BSD
-RDEPEND=net-misc/openssh net-nds/rpcbind !=sys-apps/systemd-207-r5 >=coreos-base/coreos-cloudinit-0.1.2-r5
+RDEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-lang/python:2.7 ) app-admin/logrotate sys-block/parted sys-apps/gptfdisk >=sys-apps/systemd-207-r5 >=coreos-base/coreos-cloudinit-0.1.2-r5
REQUIRED_USE=symlink-usr
SLOT=0
_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 52a888802d25387c2c74cb845d1219bc multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=829b077c40598a500af6243a9ba05e66
+_md5_=e2e966db492fb67beb19faf11fddf287
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 734e6a8b54..1b60749ba6 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
@@ -1,13 +1,13 @@
DEFINED_PHASES=info install unpack
-DEPEND=net-misc/openssh net-nds/rpcbind !=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-lang/python:2.7 ) >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
DESCRIPTION=Init scripts for CoreOS
EAPI=4
HOMEPAGE=http://www.coreos.com/
IUSE=test symlink-usr cros_workon_tree_* profiling
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=BSD
-RDEPEND=net-misc/openssh net-nds/rpcbind !=sys-apps/systemd-207-r5 >=coreos-base/coreos-cloudinit-0.1.2-r5
+RDEPEND=net-misc/openssh net-nds/rpcbind !coreos-base/oem-service test? ( dev-lang/python:2.7 ) app-admin/logrotate sys-block/parted sys-apps/gptfdisk >=sys-apps/systemd-207-r5 >=coreos-base/coreos-cloudinit-0.1.2-r5
REQUIRED_USE=symlink-usr
SLOT=0
_eclasses_=cros-workon 4ad6e6491a1010ad7c875302b3be18ba git-r3 52a888802d25387c2c74cb845d1219bc multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=829b077c40598a500af6243a9ba05e66
+_md5_=e2e966db492fb67beb19faf11fddf287
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r4
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.2.4-r4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.3-r2
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.3-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.3-r2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.1-r1
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.1.1-r1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.4-r2
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.4-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.4-r2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.8-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.8-r2
deleted file mode 100644
index f6760741cc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.3.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile info install prepare unpack
-DEPEND=dev-lang/go:1.7= >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
-DESCRIPTION=etcd
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=+etcdctl +go_version_go1_7 cros_workon_tree_* profiling
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcd:0 etcdctl? ( !dev-db/etcdctl )
-REQUIRED_USE=go_version_go1_7
-SLOT=2
-_eclasses_=coreos-go 1b5f6ac7749b16d9f26b8b2813f6d09c coreos-go-depend 14c6f09b2aaca3f3965f1895f1566f7c coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=9550f0f285a17cf77e4b0e0707c1d5bf
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
deleted file mode 100644
index 956dd0ecff..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile info install prepare unpack
-DEPEND=dev-lang/go:1.7= >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
-DESCRIPTION=etcd
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=+etcdctl +go_version_go1_7 cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcd:0 etcdctl? ( !dev-db/etcdctl )
-REQUIRED_USE=go_version_go1_7
-SLOT=2
-_eclasses_=coreos-go 1b5f6ac7749b16d9f26b8b2813f6d09c coreos-go-depend 14c6f09b2aaca3f3965f1895f1566f7c coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 cros-workon 4ad6e6491a1010ad7c875302b3be18ba epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 git-r3 52a888802d25387c2c74cb845d1219bc ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 6f5991c7101863d0b29df63990ad852e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=9550f0f285a17cf77e4b0e0707c1d5bf
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.8.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.8.6
similarity index 86%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.8.5
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.8.6
index 1fcf3c0261..5e50e17213 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.8.5
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-1.8.6
@@ -6,7 +6,7 @@ HOMEPAGE=http://www.golang.org
KEYWORDS=-* amd64 arm64
LICENSE=BSD
RDEPEND=app-eselect/eselect-go
-SLOT=1.8/1.8.5
-SRC_URI=https://storage.googleapis.com/golang/go1.8.5.src.tar.gz
+SLOT=1.8/1.8.6
+SRC_URI=https://storage.googleapis.com/golang/go1.8.6.src.tar.gz
_eclasses_=coreos-go-lang 5983edbc8ebcd4ee0977c514df5904e2 coreos-go-utils c34072f13165bb85e5106cc6e082a4e1 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=29f76ceada4828394b60460d3163e657
+_md5_=ecb55eb99b642b7f935066ec40ca4dc6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.14-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.15
similarity index 53%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.14-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.15
index 0d474743f6..5981d40dce 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.14-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.14.15
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-modules-4.14.14-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[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode ) =sys-kernel/coreos-sources-4.14.14
+DEPEND==sys-kernel/coreos-modules-4.14.15 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[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode ) =sys-kernel/coreos-sources-4.14.15
DESCRIPTION=CoreOS Linux kernel
EAPI=5
HOMEPAGE=http://www.kernel.org
KEYWORDS=amd64 arm64
LICENSE=GPL-2 freedist
-RDEPEND==sys-kernel/coreos-modules-4.14.14-r1
+RDEPEND==sys-kernel/coreos-modules-4.14.15
RESTRICT=binchecks strip
-SLOT=0/4.14.14-r1
+SLOT=0/4.14.15
_eclasses_=coreos-kernel e8feb48b1a123c62c678f86fd8ac3067 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=3e4e3373c05c9f190b12d6c0c9520669
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.14-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.15
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.14-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.15
index af1453c718..e2df2830a7 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.14-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.14.15
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
-DEPEND==sys-kernel/coreos-sources-4.14.14
+DEPEND==sys-kernel/coreos-sources-4.14.15
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.14.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.14.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.15
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.15.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 kernel-2 880361b861490d9503f47d4f16e05f2c ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=15a4e4ad46a4b3fef881b0eb75450c4e
+_md5_=7ca470ff8c885956f6f2f3246752c9c3
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
index a829f6fc6c..7e3a5b1ad9 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
@@ -96,10 +96,6 @@ sys-apps/portage -xattr
# Enable -M and -Z flags; -M is used by mayday
sys-process/lsof rpc selinux
-# Don't include etcd2's etcdctl so we can include the newer version via the
-# etcdctl package
-dev-db/etcd -etcdctl
-
# can be removed with socat-2.0.0; this is the openssl/readline license
# incompatibility
net-misc/socat -ssl