diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.5-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.5-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/fleet/fleet-0.11.5-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.1.2_p0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.1.2_p0-r3.ebuild
similarity index 97%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.1.2_p0-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.1.2_p0-r3.ebuild
index 193c2e4239..b1ed1f7ba4 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.1.2_p0-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet/kubelet-1.1.2_p0-r3.ebuild
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-lang/go"
+DEPEND="dev-lang/go:="
 RDEPEND="net-misc/socat"
 
 src_prepare() {
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.3.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.3.4-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.3.4.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.3.4-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-0.1.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-0.1.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/mayday/mayday-0.1.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/sdnotify-proxy/sdnotify-proxy-0.1.0-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.3.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.3.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-1.3.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-crypt/go-tspi/go-tspi-0.1-r3.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.2.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.2.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-0.2.2-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
index ccff4bc59e..52463d2328 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild
@@ -23,7 +23,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=dev-lang/go-1.4.3"
 RDEPEND="sys-apps/kmod
 	app-crypt/gnupg
 	sys-apps/systemd"
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.5.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.5.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.5.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/actool/actool-0.5.1-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.2-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.0.0-r2.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.9.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.9.2-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.9.2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.9.2-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.3.0-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.3.0.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-0.3.0-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r18.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r19.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r18.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coretest/coretest-0.0.1-r19.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.7-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.7-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.10.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.10-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.10.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/mantle/mantle-0.0.10-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r2.ebuild
similarity index 95%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r2.ebuild
index 5cc5f4d1f9..8d8710622e 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.4.9-r2.ebuild
@@ -4,7 +4,7 @@
 # $Header:$
 #
 
-EAPI=4
+EAPI=5
 CROS_WORKON_PROJECT="coreos/etcd"
 CROS_WORKON_LOCALNAME="etcd"
 CROS_WORKON_REPO="git://github.com"
@@ -24,7 +24,7 @@ SRC_URI=""
 LICENSE="Apache-2.0"
 SLOT="1"
 
-DEPEND=">=dev-lang/go-1.2"
+DEPEND=">=dev-lang/go-1.2:="
 RDEPEND="!dev-db/etcd:0
 	!dev-db/etcd-starter"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.5.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.5-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.2.5-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcdctl/etcdctl-0.4.6-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-util/go-bindata/go-bindata-3.0.5-r3.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.3.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.3.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.3.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-0.3.1-r1.ebuild