diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.2.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.2.0-r1
deleted file mode 100644
index 57d9f81f0d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.2.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=flannel
-EAPI=4
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=app-admin/sdnotify-proxy
-SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=736433fcb93dfeeb50c93954608346d8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.4.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.4.0
new file mode 100644
index 0000000000..02bf238f6b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-0.4.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=virtual/pkgconfig
+DESCRIPTION=flannel
+EAPI=4
+HOMEPAGE=https://github.com/coreos/flannel
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+RDEPEND=app-admin/sdnotify-proxy
+SLOT=0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=1533657f9a20953b63d15b823fbd740e
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
index 78ce32b678..8dcef29a26 100644
--- 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
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=flannel
 EAPI=4
 HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=app-admin/sdnotify-proxy
 SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=736433fcb93dfeeb50c93954608346d8
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=1533657f9a20953b63d15b823fbd740e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.10.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.10.2
new file mode 100644
index 0000000000..202aa10a11
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.10.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go virtual/pkgconfig
+DESCRIPTION=fleet
+EAPI=5
+HOMEPAGE=https://github.com/coreos/fleet
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a9615d1951f600b0246ca31549b4d2f0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.9.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.9.0
deleted file mode 100644
index 9e65383fdf..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/fleet-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.3 dev-vcs/git virtual/pkgconfig
-DESCRIPTION=fleet
-EAPI=4
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=186be1a11b3541bc5ed4366372ddf17e
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 377b26d9a3..8536fbf234 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.3 dev-vcs/git virtual/pkgconfig
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go virtual/pkgconfig
 DESCRIPTION=fleet
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/coreos/fleet
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=186be1a11b3541bc5ed4366372ddf17e
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a9615d1951f600b0246ca31549b4d2f0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.2.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.2.2
deleted file mode 100644
index 0e24ddc805..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
-DESCRIPTION=locksmith
-EAPI=4
-HOMEPAGE=https://github.com/coreos/locksmith
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f8197ad4936528ecec40fa00e3a3c1d8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.3.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.3.0
new file mode 100644
index 0000000000..6e0d3b3449
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/locksmith-0.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 virtual/pkgconfig dev-lang/go
+DESCRIPTION=locksmith
+EAPI=5
+HOMEPAGE=https://github.com/coreos/locksmith
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=67c8ab18b3cb954bf7533c651608326b
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 1044169f97..9d21e6eeaa 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 virtual/pkgconfig dev-lang/go
 DESCRIPTION=locksmith
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/coreos/locksmith
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f8197ad4936528ecec40fa00e3a3c1d8
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=67c8ab18b3cb954bf7533c651608326b
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-0.1.0
new file mode 100644
index 0000000000..556b3c3ded
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-0.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=mayday
+EAPI=5
+HOMEPAGE=https://github.com/coreos/mayday
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e313fe1d1f5a81a98055ceb678a27b80
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
new file mode 100644
index 0000000000..0b7ce84a43
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/mayday-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=mayday
+EAPI=5
+HOMEPAGE=https://github.com/coreos/mayday
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e313fe1d1f5a81a98055ceb678a27b80
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0
deleted file mode 100644
index 5be30ed032..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.3 dev-vcs/git
-DESCRIPTION=fleet
-EAPI=4
-HOMEPAGE=https://github.com/coreos/sdnotify-proxy
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=aacc55da380326f5e0294cc7fa76fd05
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r1
new file mode 100644
index 0000000000..5562ba9631
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/sdnotify-proxy-0.1.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=sdnotify-proxy
+EAPI=5
+HOMEPAGE=https://github.com/coreos/sdnotify-proxy
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_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 b3fc3ff579..4615290b0d 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.3 dev-vcs/git
-DESCRIPTION=fleet
-EAPI=4
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=sdnotify-proxy
+EAPI=5
 HOMEPAGE=https://github.com/coreos/sdnotify-proxy
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=aacc55da380326f5e0294cc7fa76fd05
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=f9be5b8fc722ade07ef8ee077b6169f6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r4
deleted file mode 100644
index ab571077a5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=toolbox
-EAPI=4
-HOMEPAGE=https://github.com/coreos/toolbox
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c5ac10a95193b48c2abe3b6f6feb809e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r5
new file mode 100644
index 0000000000..8942a7287e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/toolbox-0.0.0-r5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=toolbox
+EAPI=4
+HOMEPAGE=https://github.com/coreos/toolbox
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=26a50e180120b1b5d1db650c432c9a36
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 d1a3d47776..1af510a37c 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=toolbox
 EAPI=4
 HOMEPAGE=https://github.com/coreos/toolbox
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c5ac10a95193b48c2abe3b6f6feb809e
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=26a50e180120b1b5d1db650c432c9a36
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.0
index 8a2ace3e10..3e39352e2f 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/updateservicectl-1.3.0
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go
 DESCRIPTION=CoreUpdate Management CLI
 EAPI=5
 HOMEPAGE=https://github.com/coreos/updateservicectl
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/updatectl
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=98402362a428d853ce2c9d80a7ab2296
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=7897dbcda1d1d33c653b2394ce70e6ee
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 a7706adbe3..d27e4f7adc 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go
 DESCRIPTION=CoreUpdate Management CLI
 EAPI=5
 HOMEPAGE=https://github.com/coreos/updateservicectl
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/updatectl
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=98402362a428d853ce2c9d80a7ab2296
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=7897dbcda1d1d33c653b2394ce70e6ee
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420
new file mode 100644
index 0000000000..0a9f1bb154
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-crypt/efitools-1.5.3_p20150420
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi app-crypt/sbsigntool virtual/pkgconfig dev-perl/File-Slurp
+DESCRIPTION=Tools for manipulating UEFI secure boot platforms
+EAPI=4
+HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl sys-apps/util-linux
+SLOT=0
+SRC_URI=http://storage.core-os.net/mirror/snapshots/efitools-1.5.3_p20150420.tar.gz
+_md5_=c5819890b59635f6c1a1e13f6c32fbe5
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1
new file mode 100644
index 0000000000..f8b010d0f0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-0.5.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=App Container builder and validator
+EAPI=5
+HOMEPAGE=https://github.com/appc/spec
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_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
new file mode 100644
index 0000000000..2b4b4fda88
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/actool-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=App Container builder and validator
+EAPI=5
+HOMEPAGE=https://github.com/appc/spec
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=f0f83c5041dace50483122a72038374a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.3.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.3.3-r1
deleted file mode 100644
index 7705c485d6..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile info install postinst setup unpack
-DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( sys-fs/lvm2[thin] ) >=dev-lang/go-1.2 btrfs? ( >=sys-fs/btrfs-progs-0.20 ) dev-vcs/git dev-vcs/mercurial virtual/pkgconfig virtual/pkgconfig dev-vcs/git
-DESCRIPTION=Docker complements kernel namespacing with a high-level API which operates at the process level.
-EAPI=5
-HOMEPAGE=https://www.docker.io/
-IUSE=aufs +btrfs contrib +device-mapper doc lxc vim-syntax zsh-completion cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( sys-fs/lvm2[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 lxc? ( >=app-emulation/lxc-1.0 ) >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 aufs? ( || ( sys-fs/aufs3 sys-kernel/aufs-sources ) )
-RESTRICT=installsources strip
-SLOT=0
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=794215683d07eb045133e7bbe46228ce
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.4.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.4.1
deleted file mode 100644
index 82078473a2..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile info install postinst prepare setup unpack
-DEPEND=>=sys-kernel/coreos-kernel-3.18.0 >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) >=dev-lang/go-1.3 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) virtual/pkgconfig virtual/pkgconfig dev-vcs/git
-DESCRIPTION=Docker complements kernel namespacing with a high-level API which operates at the process level
-EAPI=5
-HOMEPAGE=https://www.docker.com
-IUSE=aufs +btrfs contrib +device-mapper doc lxc vim-syntax zsh-completion cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=sys-kernel/coreos-kernel-3.18.0 >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0 ) aufs? ( || ( sys-fs/aufs3 sys-kernel/aufs-sources ) )
-RESTRICT=installsources strip
-SLOT=0
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2002e4d65b38b231df9d2b6cd3c5d3b3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.7.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.7.0
new file mode 100644
index 0000000000..ce459d2743
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/docker-1.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile info install postinst prepare setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) >=dev-lang/go-1.4 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Docker complements kernel namespacing with a high-level API which operates at the process level
+EAPI=5
+HOMEPAGE=https://www.docker.com
+IUSE=aufs +btrfs contrib +device-mapper doc experimental lxc +overlay vim-syntax zsh-completion cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0.7 ) aufs? ( || ( sys-fs/aufs3 sys-fs/aufs4 sys-kernel/aufs-sources ) )
+RESTRICT=installsources strip
+SLOT=0
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a9c019bcc63221983b8f631c95fc2cdb
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 7c24d5d30b..7aa64a23a7 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
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile info install postinst prepare setup unpack
-DEPEND=>=sys-kernel/coreos-kernel-3.18.0 >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) >=dev-lang/go-1.3 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) virtual/pkgconfig virtual/pkgconfig dev-vcs/git
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) >=dev-lang/go-1.4 btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) sys-kernel/coreos-kernel virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Docker complements kernel namespacing with a high-level API which operates at the process level
 EAPI=5
 HOMEPAGE=https://www.docker.com
-IUSE=aufs +btrfs contrib +device-mapper doc lxc vim-syntax zsh-completion cros_workon_tree_* profiling
+IUSE=aufs +btrfs contrib +device-mapper doc experimental lxc +overlay vim-syntax zsh-completion cros_workon_tree_* profiling
 LICENSE=Apache-2.0
-RDEPEND=>=sys-kernel/coreos-kernel-3.18.0 >=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0 ) aufs? ( || ( sys-fs/aufs3 sys-kernel/aufs-sources ) )
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 lxc? ( >=app-emulation/lxc-1.0.7 ) aufs? ( || ( sys-fs/aufs3 sys-fs/aufs4 sys-kernel/aufs-sources ) )
 RESTRICT=installsources strip
 SLOT=0
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2002e4d65b38b231df9d2b6cd3c5d3b3
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a9c019bcc63221983b8f631c95fc2cdb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-daemon-1.1.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-daemon-1.1.1-r2
index 3d11d3a6b8..180a62f591 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-daemon-1.1.1-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-compute-daemon-1.1.1-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python-oem
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/compute-image-packages/releases/download/1.1.1/google-daemon-1.1.1.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bd421b5e317a18f293b394b9db96bd8a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-startup-scripts-1.1.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-startup-scripts-1.1.1-r1
index 103b1d3c58..abb37804d4 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-startup-scripts-1.1.1-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/google-startup-scripts-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/python-oem
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/compute-image-packages/releases/download/1.1.1/google-startup-scripts-1.1.1.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a2e7b959efc09d5bb40104ad545eb779
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/nova-agent-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/nova-agent-9999
index dab15c980d..83ed274ca7 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/nova-agent-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/nova-agent-9999
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pyxenstore
 SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e2387a59fee4cf367c6d355c9f32319c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-9.4.6-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-9.10.0
similarity index 51%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-9.4.6-r2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-9.10.0
index 6f9f890038..dc4dcc8ea2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-9.4.6-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-9.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/glib:2 sys-process/procps deploypkg? ( dev-libs/libmspack ) dnet? ( dev-libs/libdnet ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=dev-libs/glib:2 sys-process/procps deploypkg? ( dev-libs/libmspack ) dnet? ( dev-libs/libdnet ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
 DESCRIPTION=VMware tools for distribution via /usr/share/oem
 EAPI=5
 HOMEPAGE=http://open-vm-tools.sourceforge.net/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=dnet? ( dev-libs/libdnet ) deploypkg? ( dev-libs/libmspack )
 SLOT=0
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=499a165844dc5417fbb149fead33b945
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=df90d7b05f6258733ad716d3d22dee8c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-0.5.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-0.5.5
new file mode 100644
index 0000000000..01898bd593
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-lang/go-1.3 app-arch/cpio sys-fs/squashfs-tools >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=App Container runtime
+EAPI=5
+HOMEPAGE=https://github.com/coreos/rkt
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-emulation/rocket
+SLOT=0
+SRC_URI=http://stable.release.core-os.net/amd64-usr/444.5.0/coreos_production_pxe_image.cpio.gz -> pxe-444.5.0.img
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a9e15e68f45a52072cd5f254dfcc1bbd
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
new file mode 100644
index 0000000000..8efb1c7cdf
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/rkt-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-lang/go-1.3 app-arch/cpio sys-fs/squashfs-tools >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=App Container runtime
+EAPI=5
+HOMEPAGE=https://github.com/coreos/rkt
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-emulation/rocket
+SLOT=0
+SRC_URI=http://stable.release.core-os.net/amd64-usr/444.5.0/coreos_production_pxe_image.cpio.gz -> pxe-444.5.0.img
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a9e15e68f45a52072cd5f254dfcc1bbd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.0.11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.0.11
deleted file mode 100644
index 550352ee02..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.0.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-vcs/git
-DESCRIPTION=Windows Azure Linux Agent
-EAPI=4
-HOMEPAGE=https://github.com/Azure/WALinuxAgent
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/python-oem
-SLOT=0
-_eclasses_=git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=72201505540accb31c1fb00bed53c04e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.0.13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.0.13
new file mode 100644
index 0000000000..8f28a2c2cf
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/wa-linux-agent-2.0.13
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DEPEND=dev-vcs/git
+DESCRIPTION=Windows Azure Linux Agent
+EAPI=4
+HOMEPAGE=https://github.com/Azure/WALinuxAgent
+KEYWORDS=amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/python-oem
+SLOT=0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=1bd85aaccf16644e83573d6c4aba7a85
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenserver-pv-version-6.2.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenserver-pv-version-6.2.0
index 9a48da6bf1..fff6c22657 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenserver-pv-version-6.2.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenserver-pv-version-6.2.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=app-emulation/xenstore
 SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9467c774b96ee9c6c7111be1f3d56f85
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenstore-4.4.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenstore-4.4.0-r1
index 3e206884cb..af37495da3 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenstore-4.4.0-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/xenstore-4.4.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=virtual/pkgconfig
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
 DESCRIPTION=Xen's xenstore client utility
 EAPI=5
 HOMEPAGE=http://xen.org/
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.4.0/xen-4.4.0.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e99c2215df26c101cf21818bb675bb76
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=47ffa7054ac5e5db27a3c0a3f8cd91d7
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-3.16-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-3.19.1
similarity index 50%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-3.16-r2
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-3.19.1
index b06599417f..e7e7d230d5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-3.16-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-misc/ca-certificates-3.19.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile install postinst setup
 DEPEND=dev-libs/openssl sys-apps/findutils sys-apps/systemd || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
 DESCRIPTION=Mozilla's CA Certificate Store
 EAPI=5
@@ -7,6 +7,6 @@ KEYWORDS=amd64
 LICENSE=MPL-2.0 GPL-2
 RDEPEND=dev-libs/openssl sys-apps/findutils sys-apps/systemd
 SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_RTM/src/nss-3.16.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=87bbb2b4b4af23ca34edebc04ec72dda
+SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/nss-3.19.1.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=99a75c24de8335ba7cb268a3af48138d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-shells/bash-4.2_p50-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-shells/bash-4.2_p53-r1
similarity index 53%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-shells/bash-4.2_p50-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-shells/bash-4.2_p53-r1
index 4051f989c7..b88e589d24 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-shells/bash-4.2_p50-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-shells/bash-4.2_p53-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The standard GNU Bourne again shell
 EAPI=4
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline vanilla
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2 readline? ( >=sys-libs/readline-6.2 ) nls? ( virtual/libintl ) !!<sys-apps/portage-2.1.6.7_p1 !!<sys-apps/paludis-0.26.0_alpha5
 SLOT=0
-SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c17fd8c9a1d7824a3c9841279c683d96
+SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-051 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-052 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-053 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-051 mirror://gnu/bash/bash-4.2-patches/bash42-052 mirror://gnu/bash/bash-4.2-patches/bash42-053
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=3517834f3381846ac09372592a2fd391
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 0d84d02e8f..f8f0de251d 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,8 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=CoreOS (meta package)
 EAPI=2
 HOMEPAGE=http://coreos.com
-KEYWORDS=amd64 arm x86
+IUSE=etcd_protocols_1 etcd_protocols_2
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
-RDEPEND=virtual/linux-sources >=sys-apps/baselayout-2.0.0 app-editors/vim app-emulation/xenstore app-emulation/xenserver-pv-version sys-apps/findutils sys-apps/which app-admin/flannel app-admin/fleet app-admin/locksmith app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-shells/bash coreos-base/vboot_reference coreos-base/update_engine coreos-base/coreos-init coreos-base/coreos-cloudinit coreos-base/coretest net-analyzer/nmap net-firewall/ipset net-firewall/iptables net-misc/bridge-utils net-misc/dhcpcd net-misc/ntp net-misc/rsync net-misc/wget sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/net-tools sys-apps/pciutils sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/systemd sys-apps/usbutils sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm 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 app-emulation/docker app-misc/ca-certificates app-crypt/gnupg virtual/udev dev-db/etcd dev-db/etcdctl net-fs/nfs-utils net-misc/iputils dev-vcs/git
+RDEPEND=virtual/linux-sources >=sys-apps/baselayout-2.0.0 app-editors/vim etcd_protocols_1? ( dev-db/etcd:1 !etcd_protocols_2? ( dev-db/etcdctl ) ) etcd_protocols_2? ( dev-db/etcd:2 ) app-emulation/actool app-emulation/rkt app-emulation/xenstore app-emulation/xenserver-pv-version sys-apps/findutils sys-apps/which app-admin/flannel app-admin/fleet app-admin/locksmith app-admin/mayday app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-misc/jq app-shells/bash coreos-base/update_engine coreos-base/coreos-init coreos-base/coreos-cloudinit coreos-base/coretest net-analyzer/nmap net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-misc/bridge-utils net-misc/dhcpcd net-misc/ntp net-misc/rsync net-misc/wget sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/net-tools sys-apps/pciutils sys-apps/rng-tools sys-apps/rootdev sys-apps/sed sys-apps/seismograph sys-apps/shadow sys-apps/systemd sys-apps/usbutils sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm 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 app-emulation/docker app-misc/ca-certificates app-crypt/gnupg virtual/udev net-fs/nfs-utils net-misc/iputils dev-vcs/git
 SLOT=0
-_md5_=49f74becd0c3f27a5982d15296846fdc
+_md5_=09fd7324d78260c33bd571b3493dc6f0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r244 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r244
deleted file mode 100644
index 0d84d02e8f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r244
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=CoreOS (meta package)
-EAPI=2
-HOMEPAGE=http://coreos.com
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=virtual/linux-sources >=sys-apps/baselayout-2.0.0 app-editors/vim app-emulation/xenstore app-emulation/xenserver-pv-version sys-apps/findutils sys-apps/which app-admin/flannel app-admin/fleet app-admin/locksmith app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-shells/bash coreos-base/vboot_reference coreos-base/update_engine coreos-base/coreos-init coreos-base/coreos-cloudinit coreos-base/coretest net-analyzer/nmap net-firewall/ipset net-firewall/iptables net-misc/bridge-utils net-misc/dhcpcd net-misc/ntp net-misc/rsync net-misc/wget sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/net-tools sys-apps/pciutils sys-apps/rootdev sys-apps/sed sys-apps/shadow sys-apps/systemd sys-apps/usbutils sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm 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 app-emulation/docker app-misc/ca-certificates app-crypt/gnupg virtual/udev dev-db/etcd dev-db/etcdctl net-fs/nfs-utils net-misc/iputils dev-vcs/git
-SLOT=0
-_md5_=49f74becd0c3f27a5982d15296846fdc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r256 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r256
new file mode 100644
index 0000000000..f8f0de251d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-0.0.1-r256
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=CoreOS (meta package)
+EAPI=2
+HOMEPAGE=http://coreos.com
+IUSE=etcd_protocols_1 etcd_protocols_2
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=GPL-2
+RDEPEND=virtual/linux-sources >=sys-apps/baselayout-2.0.0 app-editors/vim etcd_protocols_1? ( dev-db/etcd:1 !etcd_protocols_2? ( dev-db/etcdctl ) ) etcd_protocols_2? ( dev-db/etcd:2 ) app-emulation/actool app-emulation/rkt app-emulation/xenstore app-emulation/xenserver-pv-version sys-apps/findutils sys-apps/which app-admin/flannel app-admin/fleet app-admin/locksmith app-admin/mayday app-admin/sudo app-admin/toolbox app-arch/gzip app-arch/tar app-arch/unzip app-arch/zip app-misc/jq app-shells/bash coreos-base/update_engine coreos-base/coreos-init coreos-base/coreos-cloudinit coreos-base/coretest net-analyzer/nmap net-firewall/ebtables net-firewall/ipset net-firewall/iptables net-misc/bridge-utils net-misc/dhcpcd net-misc/ntp net-misc/rsync net-misc/wget sys-apps/coreutils sys-apps/dbus sys-apps/ethtool sys-apps/gawk sys-apps/grep sys-apps/iproute2 sys-apps/kexec-tools sys-apps/less sys-apps/net-tools sys-apps/pciutils sys-apps/rng-tools sys-apps/rootdev sys-apps/sed sys-apps/seismograph sys-apps/shadow sys-apps/systemd sys-apps/usbutils sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm 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 app-emulation/docker app-misc/ca-certificates app-crypt/gnupg virtual/udev net-fs/nfs-utils net-misc/iputils dev-vcs/git
+SLOT=0
+_md5_=09fd7324d78260c33bd571b3493dc6f0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-au-key-0.0.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-au-key-0.0.2
index 0e1688577e..7370de6a39 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-au-key-0.0.2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-au-key-0.0.2
@@ -3,8 +3,8 @@ DESCRIPTION=CoreOS auto update signing keys.
 EAPI=5
 HOMEPAGE=http://github.com/coreos/
 IUSE=cros_host official
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
 REQUIRED_USE=?? ( cros_host official )
 SLOT=0
-_md5_=8e4dc814682a0b650dad0cc2979e60c1
+_md5_=f0e929eff533ff21d6c86c00c18710d6
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.1.0
deleted file mode 100644
index e2e5e809fb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 !<coreos-base/coreos-init-0.0.1-r69 dev-vcs/git virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=coreos-cloudinit
-EAPI=4
-HOMEPAGE=https://github.com/coreos/coreos-cloudinit
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=sys-apps/shadow-4.1.5.1
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=85846f09006211f53f715d48e02b4507
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.4.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.4.1
new file mode 100644
index 0000000000..3e595e24f6
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-cloudinit-1.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=!<coreos-base/coreos-init-0.0.1-r69 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig virtual/pkgconfig dev-lang/go
+DESCRIPTION=coreos-cloudinit
+EAPI=5
+HOMEPAGE=https://github.com/coreos/coreos-cloudinit
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2.0
+RDEPEND=>=sys-apps/shadow-4.1.5.1
+SLOT=0
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=673ed50a2fa5c44b8d5a426e3c8165b0
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 6aa48cfe24..90e5599c97 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 !<coreos-base/coreos-init-0.0.1-r69 dev-vcs/git virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=!<coreos-base/coreos-init-0.0.1-r69 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig virtual/pkgconfig dev-lang/go
 DESCRIPTION=coreos-cloudinit
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/coreos/coreos-cloudinit
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=sys-apps/shadow-4.1.5.1
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=85846f09006211f53f715d48e02b4507
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
+_md5_=673ed50a2fa5c44b8d5a426e3c8165b0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0
index 4ed3c1e7b1..c5a874a9cb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0
@@ -3,8 +3,8 @@ DESCRIPTION=CoreOS developer images and containers (meta package)
 EAPI=4
 HOMEPAGE=http://coreos.com
 IUSE=vm-testing
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
-RDEPEND=app-portage/gentoolkit coreos-base/coreos coreos-base/coreos-experimental coreos-base/gmerge dev-lang/python dev-python/dbus-python dev-python/pygobject dev-util/strace dev-vcs/repo net-analyzer/netperf net-analyzer/tcpdump net-dialup/minicom net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/findutils sys-apps/i2c-tools sys-apps/kbd sys-apps/less sys-apps/portage sys-apps/smartmontools sys-apps/which sys-devel/gcc sys-devel/gdb sys-fs/fuse sys-fs/lvm2 sys-fs/sshfs-fuse sys-process/ktop sys-process/procps sys-process/psmisc vm-testing? ( app-emulation/xen app-emulation/xen-pvgrub app-emulation/xen-tools app-emulation/qemu )
+RDEPEND=app-portage/gentoolkit coreos-base/coreos coreos-base/coreos-experimental coreos-base/gmerge dev-lang/python dev-util/strace dev-vcs/repo net-analyzer/netperf net-analyzer/tcpdump net-dialup/minicom net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/findutils sys-apps/i2c-tools sys-apps/kbd sys-apps/less sys-apps/portage sys-apps/smartmontools sys-apps/which sys-devel/gcc sys-devel/gdb sys-fs/fuse sys-fs/lvm2 sys-fs/sshfs-fuse sys-process/ktop sys-process/procps sys-process/psmisc vm-testing? ( app-emulation/xen app-emulation/xen-pvgrub app-emulation/xen-tools app-emulation/qemu )
 SLOT=0
-_md5_=e2c4943ccb19c705b5b33dde08281b3e
+_md5_=de2b1e30adf7c2cd249f2db565afa556
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0-r73 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0-r73
deleted file mode 100644
index 4ed3c1e7b1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0-r73
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=CoreOS developer images and containers (meta package)
-EAPI=4
-HOMEPAGE=http://coreos.com
-IUSE=vm-testing
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=app-portage/gentoolkit coreos-base/coreos coreos-base/coreos-experimental coreos-base/gmerge dev-lang/python dev-python/dbus-python dev-python/pygobject dev-util/strace dev-vcs/repo net-analyzer/netperf net-analyzer/tcpdump net-dialup/minicom net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/findutils sys-apps/i2c-tools sys-apps/kbd sys-apps/less sys-apps/portage sys-apps/smartmontools sys-apps/which sys-devel/gcc sys-devel/gdb sys-fs/fuse sys-fs/lvm2 sys-fs/sshfs-fuse sys-process/ktop sys-process/procps sys-process/psmisc vm-testing? ( app-emulation/xen app-emulation/xen-pvgrub app-emulation/xen-tools app-emulation/qemu )
-SLOT=0
-_md5_=e2c4943ccb19c705b5b33dde08281b3e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0-r74 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0-r74
new file mode 100644
index 0000000000..c5a874a9cb
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-dev-0.1.0-r74
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=CoreOS developer images and containers (meta package)
+EAPI=4
+HOMEPAGE=http://coreos.com
+IUSE=vm-testing
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=GPL-2
+RDEPEND=app-portage/gentoolkit coreos-base/coreos coreos-base/coreos-experimental coreos-base/gmerge dev-lang/python dev-util/strace dev-vcs/repo net-analyzer/netperf net-analyzer/tcpdump net-dialup/minicom net-misc/dhcp net-misc/iperf net-misc/iputils net-misc/openssh net-misc/rsync sys-apps/coreutils sys-apps/diffutils sys-apps/file sys-apps/findutils sys-apps/i2c-tools sys-apps/kbd sys-apps/less sys-apps/portage sys-apps/smartmontools sys-apps/which sys-devel/gcc sys-devel/gdb sys-fs/fuse sys-fs/lvm2 sys-fs/sshfs-fuse sys-process/ktop sys-process/procps sys-process/psmisc vm-testing? ( app-emulation/xen app-emulation/xen-pvgrub app-emulation/xen-tools app-emulation/qemu )
+SLOT=0
+_md5_=de2b1e30adf7c2cd249f2db565afa556
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1
index d7c5fdbb59..bde31220fe 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=CoreOS Experimental Packages
 EAPI=4
 HOMEPAGE=http://coreos.com
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
 SLOT=0
-_md5_=5b0d2714d80b6bb5d4adf35bbd3d35f0
+_md5_=0785ad67f91c619d1b1830f3816d94db
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1-r5
index d7c5fdbb59..bde31220fe 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1-r5
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-experimental-0.0.1-r5
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=CoreOS Experimental Packages
 EAPI=4
 HOMEPAGE=http://coreos.com
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
 SLOT=0
-_md5_=5b0d2714d80b6bb5d4adf35bbd3d35f0
+_md5_=0785ad67f91c619d1b1830f3816d94db
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r105 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r105
deleted file mode 100644
index 71521fd531..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r105
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !coreos-base/oem-service test? ( dev-lang/python:2.7 ) dev-vcs/git 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 x86
-LICENSE=BSD
-RDEPEND=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !coreos-base/oem-service test? ( dev-lang/python:2.7 ) 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	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f6617ff50ccdae7407b4a25ef8804bd0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r108 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r108
new file mode 100644
index 0000000000..4387bcb975
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-init-0.0.1-r108
@@ -0,0 +1,13 @@
+DEFINED_PHASES=info install unpack
+DEPEND=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !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=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !coreos-base/oem-service test? ( dev-lang/python:2.7 ) 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	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=0d142be36e116106904b8e66cf31cfb4
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 b78bca9b7d..e8db144d97 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 setup unpack
-DEPEND=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !coreos-base/oem-service test? ( dev-lang/python:2.7 ) dev-vcs/git virtual/pkgconfig
+DEFINED_PHASES=info install unpack
+DEPEND=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !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 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-emulation/docker net-misc/openssh !<dev-db/etcd-0.0.1-r6 !coreos-base/oem-service test? ( dev-lang/python:2.7 ) 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	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=f6617ff50ccdae7407b4a25ef8804bd0
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=0d142be36e116106904b8e66cf31cfb4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-sb-keys-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-sb-keys-0.0.1
new file mode 100644
index 0000000000..d0d05a698e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coreos-sb-keys-0.0.1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install
+DESCRIPTION=CoreOS Secure Boot keys
+EAPI=5
+KEYWORDS=amd64 arm x86
+LICENSE=BSD
+SLOT=0
+_md5_=7889db539a8bcfdeb11a7f4045df949f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-0.0.1-r16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-0.0.1-r16
deleted file mode 100644
index 7fae02b380..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-0.0.1-r16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.1 dev-vcs/git
-DESCRIPTION=Sanity tests for CoreOS
-EAPI=5
-HOMEPAGE=https://github.com/coreos/coretest
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64 arm x86
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6ad416729d94fcd60f5081c194184445
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-0.0.1-r18 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-0.0.1-r18
new file mode 100644
index 0000000000..3758dfd64c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-0.0.1-r18
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go
+DESCRIPTION=Sanity tests for CoreOS
+EAPI=5
+HOMEPAGE=https://github.com/coreos/coretest
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64 x86
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=162c59190a101a7002ea4e6882cf1cf3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-9999
index e3cb70aea1..ed9b13f509 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/coretest-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.1 dev-vcs/git
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 dev-lang/go
 DESCRIPTION=Sanity tests for CoreOS
 EAPI=5
 HOMEPAGE=https://github.com/coreos/coretest
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6ad416729d94fcd60f5081c194184445
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=162c59190a101a7002ea4e6882cf1cf3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r530 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r531
similarity index 57%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r530
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r531
index e7bdeee2a0..645d3ddd3e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r530
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/cros-devutils-0.0.1-r531
@@ -1,5 +1,5 @@
 DEFINED_PHASES=info install preinst setup test unpack
-DEPEND=dev-vcs/git
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Development utilities for CoreOS
 EAPI=4
 HOMEPAGE=https://github.com/coreos/dev-util
@@ -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	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=56a9cdc52247d8a7c439b03cec7ed4b3
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=af3b8a77c1001bdabca70312bde88f2e
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 9eb04e677b..539400e81e 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=info install preinst setup test unpack
-DEPEND=dev-vcs/git
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Development utilities for CoreOS
 EAPI=4
 HOMEPAGE=https://github.com/coreos/dev-util
@@ -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	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=56a9cdc52247d8a7c439b03cec7ed4b3
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=af3b8a77c1001bdabca70312bde88f2e
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 5d0a71a76c..b8bed18b04 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
@@ -1,5 +1,5 @@
-DEFINED_PHASES=info setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=info unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Host test utilities for ChromiumOS
 EAPI=4
 HOMEPAGE=http://www.chromium.org/
@@ -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	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _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 94e24353d1..964553006c 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
@@ -1,5 +1,5 @@
-DEFINED_PHASES=info setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=info unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Host test utilities for ChromiumOS
 EAPI=4
 HOMEPAGE=http://www.chromium.org/
@@ -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	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _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 1b1172f8f5..9779fc564f 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=emerge utilities for CoreOS developer images
 EAPI=4
 HOMEPAGE=https://github.com/coreos/dev-util/
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/python sys-apps/portage
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a113dbcc7156488d03c03273cdb850ee
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_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 c5331f7e0d..48a272ebed 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=emerge utilities for CoreOS developer images
 EAPI=4
 HOMEPAGE=https://github.com/coreos/dev-util/
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/python sys-apps/portage
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a113dbcc7156488d03c03273cdb850ee
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=07bffcc84d780d75dd957753169bf9a3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1
index d8ca08cadf..7a33662382 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1
@@ -4,6 +4,6 @@ EAPI=2
 HOMEPAGE=http://src.chromium.org
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu app-text/texi2html coreos-base/cros-devutils[cros_host] coreos-base/cros-testutils coreos-base/vboot_reference =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go dev-libs/dbus-c++ dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/dbus-python dev-python/imaging dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pygobject dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyudev dev-python/pyusb dev-python/setproctitle dev-python/ws4py sys-devel/bc dev-util/cmake dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] >=media-libs/freetype-2.2.1 net-misc/gsutil sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-fs/sshfs-fuse sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev dev-libs/protobuf-c app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch sys-fs/libfat sys-fs/squashfs-tools coreos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad
+RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu app-text/texi2html coreos-base/cros-devutils[cros_host] coreos-base/cros-testutils =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyusb dev-python/setproctitle dev-python/ws4py sys-devel/bc dev-util/cmake dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/gsutil sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-fs/sshfs-fuse sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev dev-libs/protobuf-c app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch sys-fs/libfat sys-fs/squashfs-tools coreos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad
 SLOT=0
-_md5_=11d35bb62a952f3ef81c335ffc06c274
+_md5_=51e2c087a0bb20c551abf35348c02f53
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r170 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r170
deleted file mode 100644
index d8ca08cadf..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r170
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=List of packages that are needed on the buildhost (meta package)
-EAPI=2
-HOMEPAGE=http://src.chromium.org
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu app-text/texi2html coreos-base/cros-devutils[cros_host] coreos-base/cros-testutils coreos-base/vboot_reference =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go dev-libs/dbus-c++ dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/dbus-python dev-python/imaging dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pygobject dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyudev dev-python/pyusb dev-python/setproctitle dev-python/ws4py sys-devel/bc dev-util/cmake dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] >=media-libs/freetype-2.2.1 net-misc/gsutil sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-fs/sshfs-fuse sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev dev-libs/protobuf-c app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch sys-fs/libfat sys-fs/squashfs-tools coreos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad
-SLOT=0
-_md5_=11d35bb62a952f3ef81c335ffc06c274
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r171 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r171
deleted file mode 100644
index d8ca08cadf..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r171
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=List of packages that are needed on the buildhost (meta package)
-EAPI=2
-HOMEPAGE=http://src.chromium.org
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu app-text/texi2html coreos-base/cros-devutils[cros_host] coreos-base/cros-testutils coreos-base/vboot_reference =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go dev-libs/dbus-c++ dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/dbus-python dev-python/imaging dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pygobject dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyudev dev-python/pyusb dev-python/setproctitle dev-python/ws4py sys-devel/bc dev-util/cmake dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] >=media-libs/freetype-2.2.1 net-misc/gsutil sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-fs/sshfs-fuse sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev dev-libs/protobuf-c app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch sys-fs/libfat sys-fs/squashfs-tools coreos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad
-SLOT=0
-_md5_=11d35bb62a952f3ef81c335ffc06c274
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r174 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r174
new file mode 100644
index 0000000000..7a33662382
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/hard-host-depends-0.0.1-r174
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=List of packages that are needed on the buildhost (meta package)
+EAPI=2
+HOMEPAGE=http://src.chromium.org
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-arch/lzop app-arch/pigz app-admin/sudo sys-apps/less dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils sys-boot/syslinux sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools app-arch/cabextract >=app-arch/pbzip2-1.1.1-r1 app-arch/rpm2targz app-arch/sharutils app-arch/unzip app-emulation/qemu app-text/texi2html coreos-base/cros-devutils[cros_host] coreos-base/cros-testutils =dev-lang/python-2* dev-python/setuptools dev-lang/nasm dev-lang/swig dev-lang/yasm dev-lang/go dev-lang/go-bootstrap dev-libs/dbus-glib >=dev-libs/glib-2.26.1 dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen dev-python/m2crypto dev-python/mako dev-python/netifaces dev-python/pyinotify dev-python/pyopenssl dev-python/python-daemon dev-python/pyusb dev-python/setproctitle dev-python/ws4py sys-devel/bc dev-util/cmake dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.30 dev-util/scons dev-vcs/cvs >=dev-vcs/git-1.7.2 dev-vcs/mercurial dev-vcs/subversion[-dso] net-misc/gsutil sys-apps/usbutils sys-apps/systemd !sys-apps/nih-dbus-tool =sys-devel/automake-1.10* sys-fs/sshfs-fuse sys-libs/libnih sys-libs/nss-usrfiles sys-power/iasl virtual/udev dev-libs/protobuf-c app-text/asciidoc app-text/xmlto sys-apps/gptfdisk net-libs/libtirpc sys-apps/dbus sys-process/lsof app-arch/zip app-portage/eclass-manpages app-portage/gentoolkit app-portage/portage-utils app-editors/vim dev-util/perf sys-apps/pv app-shells/bash-completion sys-devel/smatch sys-fs/libfat sys-fs/squashfs-tools coreos-base/update_engine dev-cpp/gflags dev-python/mock dev-python/mox dev-python/unittest2 dev-python/pylint net-misc/openssh net-misc/wget dev-python/gdata dev-embedded/smdk-dltool dev-python/pyyaml virtual/cdrtools !net-misc/dhcpcd !coreos-base/google-breakpad
+SLOT=0
+_md5_=51e2c087a0bb20c551abf35348c02f53
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 d4f5326450..89864948e6 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure info install prepare setup unpack
-DEPEND=dev-libs/glib dev-libs/libevent dev-cpp/gtest cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons
+DEFINED_PHASES=compile configure info install prepare unpack
+DEPEND=dev-libs/glib dev-libs/libevent dev-cpp/gtest cros_host? ( dev-util/scons ) >=dev-vcs/git-1.8.2.1 dev-util/scons
 DESCRIPTION=Chrome base/ library extracted for use on Chrome OS
 EAPI=4
 HOMEPAGE=http://dev.chromium.org/chromium-os/packages/libchrome
 IUSE=cros_host cros_workon_tree_* profiling cros-debug
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib dev-libs/libevent
 SLOT=180609
-_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2e855f044ad2947720674f6fae3861e1
+_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_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 d4f5326450..89864948e6 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure info install prepare setup unpack
-DEPEND=dev-libs/glib dev-libs/libevent dev-cpp/gtest cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons
+DEFINED_PHASES=compile configure info install prepare unpack
+DEPEND=dev-libs/glib dev-libs/libevent dev-cpp/gtest cros_host? ( dev-util/scons ) >=dev-vcs/git-1.8.2.1 dev-util/scons
 DESCRIPTION=Chrome base/ library extracted for use on Chrome OS
 EAPI=4
 HOMEPAGE=http://dev.chromium.org/chromium-os/packages/libchrome
 IUSE=cros_host cros_workon_tree_* profiling cros-debug
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib dev-libs/libevent
 SLOT=180609
-_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2e855f044ad2947720674f6fae3861e1
+_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=59d17cd496f73ed19f46558f2a321d21
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070
index cdd20dbf72..d272271d44 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile info install prepare setup unpack
-DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss dev-cpp/gtest dev-vcs/git dev-util/scons
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss dev-cpp/gtest >=dev-vcs/git-1.8.2.1 dev-util/scons
 DESCRIPTION=Chrome crypto/ library extracted for use on Chrome OS
 EAPI=4
 HOMEPAGE=http://www.chromium.org/
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss
 SLOT=0
-_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=71908f23f801e649e498904c394c9173
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7
index 86fbf55023..31f334176f 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/nova-agent-watcher-0.0.7
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 virtual/pkgconfig dev-lang/go
 DESCRIPTION=nova-agent-watcher
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/coreos/nova-agent-watcher
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3099fd9ff642dcec7c3c94e96ff90590
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_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 b9a6f69447..b1d1d3b966 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 virtual/pkgconfig dev-lang/go
 DESCRIPTION=nova-agent-watcher
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/coreos/nova-agent-watcher
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3099fd9ff642dcec7c3c94e96ff90590
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=5f033e01316562b13f6837d69b2042a8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.0.11-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.0.11-r2
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.0.11-r1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-azure-2.0.11-r2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.1-r1
new file mode 100644
index 0000000000..1797fc11b7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-cloudsigma-0.0.1-r1
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=OEM suite for CloudSigma images
+EAPI=5
+KEYWORDS=amd64 x86
+LICENSE=Apache-2.0
+SLOT=0
+_md5_=23a2e1c70c6b975548b326fd83afdea9
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.0.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.0.3-r2
similarity index 83%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.0.3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.0.3-r2
index f2668c61d2..450f638b55 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.0.3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-ec2-compat-0.0.3-r2
@@ -6,4 +6,4 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 REQUIRED_USE=^^ ( ec2 openstack brightbox )
 SLOT=0
-_md5_=2fa312a3f7563114178120c4be902b73
+_md5_=17d08f7316f4e86f16c4df10bca2eaa8
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.1-r9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.1-r10
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.1-r9
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-rackspace-0.0.1-r10
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vagrant-0.0.1-r12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vagrant-0.0.1-r13
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vagrant-0.0.1-r12
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vagrant-0.0.1-r13
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-9.4.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-9.10.0
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-9.4.6
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-9.10.0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/protofiles-0.0.1-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/protofiles-0.0.1-r11
index 855753fe77..5b955afb8a 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/protofiles-0.0.1-r11
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/protofiles-0.0.1-r11
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=BSD
 RDEPEND=!<=chromeos-base/chromeos-chrome-16.0.886.0_rc-r1 !=chromeos-base/chromeos-chrome-16.0.882.0_alpha-r1
 SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	git	a673225a1558ef94456dbd8ce271d16a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git	a673225a1558ef94456dbd8ce271d16a	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=579f60ce72224267969c368f3c1ac26c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.0.1-r411 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.0.1-r411
deleted file mode 100644
index 1c87456c2b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.0.1-r411
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install setup test unpack
-DEPEND=coreos-base/system_api dev-cpp/gmock dev-cpp/gtest cros_host? ( dev-util/scons ) !coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] coreos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs dev-vcs/git dev-util/scons virtual/pkgconfig
-DESCRIPTION=Chrome OS Update Engine
-EAPI=4
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_host -delta_generator symlink-usr cros-debug cros_workon_tree_* profiling
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] coreos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs
-SLOT=0
-_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=833a4c6a0a773bca303a418b92c9499a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.1.0-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.1.0-r3
new file mode 100644
index 0000000000..db2a3fae74
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/update_engine-0.1.0-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure info install prepare test unpack
+DEPEND=dev-cpp/gmock dev-cpp/gtest !coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=CoreOS OS Update Engine
+EAPI=5
+HOMEPAGE=https://github.com/coreos/update_engine
+IUSE=cros-debug cros_host -delta_generator symlink-usr cros_workon_tree_* profiling
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=BSD
+RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs
+SLOT=0
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=86ff1b5fcf1d92cd00de78b8fb998b8b
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 60256d4c1a..b1ce554656 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup test unpack
-DEPEND=coreos-base/system_api dev-cpp/gmock dev-cpp/gtest cros_host? ( dev-util/scons ) !coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] coreos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs dev-vcs/git dev-util/scons virtual/pkgconfig
-DESCRIPTION=Chrome OS Update Engine
-EAPI=4
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_host -delta_generator symlink-usr cros-debug cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
+DEFINED_PHASES=compile configure info install prepare test unpack
+DEPEND=dev-cpp/gmock dev-cpp/gtest !coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=CoreOS OS Update Engine
+EAPI=5
+HOMEPAGE=https://github.com/coreos/update_engine
+IUSE=cros-debug cros_host -delta_generator symlink-usr cros_workon_tree_* profiling
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] coreos-base/libchromeos dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs
+RDEPEND=!coreos-base/coreos-installer app-arch/bzip2 coreos-base/coreos-au-key coreos-base/libchrome:180609[cros-debug=] dev-cpp/gflags dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2 dev-libs/openssl dev-libs/protobuf dev-util/bsdiff net-misc/curl sys-fs/e2fsprogs
 SLOT=0
-_eclasses_=cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=833a4c6a0a773bca303a418b92c9499a
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=86ff1b5fcf1d92cd00de78b8fb998b8b
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/vboot_reference-1.0-r887 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/vboot_reference-1.0-r887
deleted file mode 100644
index 2e7d425379..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/vboot_reference-1.0-r887
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup test unpack
-DEPEND=dev-libs/libyaml dev-libs/openssl sys-apps/util-linux dev-vcs/git
-DESCRIPTION=Chrome OS verified boot tools
-EAPI=4
-IUSE=cros_host cros-debug cros_workon_tree_* profiling
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=dev-libs/libyaml dev-libs/openssl sys-apps/util-linux
-SLOT=0
-_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7dd28c5fe3d1f0b4b42765c33fe0f559
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/vboot_reference-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/vboot_reference-9999
deleted file mode 100644
index 5f31cdab6e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/vboot_reference-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup test unpack
-DEPEND=dev-libs/libyaml dev-libs/openssl sys-apps/util-linux dev-vcs/git
-DESCRIPTION=Chrome OS verified boot tools
-EAPI=4
-IUSE=cros_host cros-debug cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libyaml dev-libs/openssl sys-apps/util-linux
-SLOT=0
-_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7dd28c5fe3d1f0b4b42765c33fe0f559
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1
index 76407189de..cd17dca518 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta ebuild for building all binary packages.
 EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=GPL-2
 RDEPEND=app-emulation/open-vm-tools coreos-base/coreos coreos-base/coreos-dev dev-lang/python-oem
 SLOT=0
-_md5_=7927f063a6dce336d123a44d59c5adef
+_md5_=b5f7bb1444a7a09a32d1ba14d8a282fe
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1-r2
index 76407189de..cd17dca518 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/board-packages-0.0.1-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Meta ebuild for building all binary packages.
 EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=GPL-2
 RDEPEND=app-emulation/open-vm-tools coreos-base/coreos coreos-base/coreos-dev dev-lang/python-oem
 SLOT=0
-_md5_=7927f063a6dce336d123a44d59c5adef
+_md5_=b5f7bb1444a7a09a32d1ba14d8a282fe
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.0.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.0.5
new file mode 100644
index 0000000000..9f1cbe1723
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-0.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Mantle: Gluing CoreOS together
+EAPI=5
+HOMEPAGE=https://github.com/coreos/mantle
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm64
+LICENSE=Apache-2
+RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=59ba65e6d30220e774a45fc4275e31c3
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
new file mode 100644
index 0000000000..098dcbdc3d
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/mantle-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Mantle: Gluing CoreOS together
+EAPI=5
+HOMEPAGE=https://github.com/coreos/mantle
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2
+RDEPEND=>=net-dns/dnsmasq-2.72[dhcp,ipv6]
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=59ba65e6d30220e774a45fc4275e31c3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
index a31c248620..23232d208b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=-
-DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-shells/bash-completion app-misc/jq coreos-base/hard-host-depends dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-boot/grub sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
+DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
 DESCRIPTION=Meta ebuild for everything that should be in the SDK.
 EAPI=5
 HOMEPAGE=http://coreos.com/docs/sdk/
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-shells/bash-completion app-misc/jq coreos-base/hard-host-depends dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-boot/grub sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
+RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
 SLOT=0
-_md5_=b1ab2fa227f2a14289f263eae802d0c1
+_md5_=970ced4dcac81b9ccf101b04fcac665f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r13
deleted file mode 100644
index a31c248620..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-shells/bash-completion app-misc/jq coreos-base/hard-host-depends dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-boot/grub sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
-DESCRIPTION=Meta ebuild for everything that should be in the SDK.
-EAPI=5
-HOMEPAGE=http://coreos.com/docs/sdk/
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-shells/bash-completion app-misc/jq coreos-base/hard-host-depends dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-boot/grub sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
-SLOT=0
-_md5_=b1ab2fa227f2a14289f263eae802d0c1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r17
new file mode 100644
index 0000000000..23232d208b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r17
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
+DESCRIPTION=Meta ebuild for everything that should be in the SDK.
+EAPI=5
+HOMEPAGE=http://coreos.com/docs/sdk/
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle dev-python/setuptools dev-util/boost-build dev-util/checkbashisms dev-vcs/repo net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/seismograph sys-boot/grub sys-boot/shim sys-devel/crossdev sys-firmware/edk2-ovmf sys-fs/btrfs-progs sys-fs/cryptsetup
+SLOT=0
+_md5_=970ced4dcac81b9ccf101b04fcac665f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.6-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.6-r2
deleted file mode 100644
index 6278a04334..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.6-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
-DESCRIPTION=etcd
-EAPI=4
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a8a8dd3d688d855c4cd03e6e6b008720
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.9-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.9-r1
new file mode 100644
index 0000000000..39cbaf841e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-0.4.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-lang/go-1.2 >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=etcd
+EAPI=4
+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_=coreos-doc	72164c6190a558664ec3293b6e572055	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=05303db4acfe2868fe3aa1d9420dd6da
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.0.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.0.12
new file mode 100644
index 0000000000..eb732c08f7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcd-2.0.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=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 arm64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcd:0 !dev-db/etcdctl
+SLOT=2
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c64d2640dd95c75e13a6cdfc89cc05f1
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 f12108b3ae..17b6261c10 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
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git virtual/pkgconfig
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=etcd
-EAPI=4
+EAPI=5
 HOMEPAGE=https://github.com/coreos/etcd
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a8a8dd3d688d855c4cd03e6e6b008720
+RDEPEND=!dev-db/etcd:0 !dev-db/etcdctl
+SLOT=2
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c64d2640dd95c75e13a6cdfc89cc05f1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6
index 673a482e44..81a36218ce 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-db/etcdctl-0.4.6
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git
+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
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
 KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _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
index 48e139e05e..d9f2a816b2 100644
--- 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
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=>=dev-lang/go-1.2 dev-vcs/git
+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
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b91f86cfd669f41f99b8d83e395721f9
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-9999
new file mode 100644
index 0000000000..e62a06a3b5
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=5
+HOMEPAGE=http://www.golang.org
+KEYWORDS=-* ~amd64 arm64
+LICENSE=BSD
+SLOT=0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6b7701ced653e38bf854d491c2a3fee4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-bootstrap-1.4.2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-bootstrap-1.4.2
deleted file mode 100644
index fb6ff727d7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-bootstrap-1.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DESCRIPTION=Version of go compiler used for bootstrapping
-EAPI=5
-HOMEPAGE=http://www.golang.org
-KEYWORDS=-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://storage.googleapis.com/golang/go1.4.2.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=e3c6f52a6ddcbaed7a0d6856e7136727
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-bootstrap-1.4.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-bootstrap-1.4.2-r1
new file mode 100644
index 0000000000..6e6b38a9eb
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/go-bootstrap-1.4.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst prepare test
+DESCRIPTION=Version of go compiler used for bootstrapping
+EAPI=5
+HOMEPAGE=http://www.golang.org
+KEYWORDS=-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://storage.googleapis.com/golang/go1.4.2.src.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=4f03d81004976ad41df9a641d03ec2bb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-oem-2.7.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-oem-2.7.6-r1
index 18ba2ac983..d5283636ed 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-oem-2.7.6-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/python-oem-2.7.6-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~
 LICENSE=PSF-2
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.6/Python-2.7.6.tar.xz mirror://gentoo/python-gentoo-patches-2.7.6-1.tar.xz http://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.6-1.tar.xz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0ca15ca853795fe5a8100c02c716a5be
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
similarity index 62%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
index 18f97eb6e6..73114029f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-lang/spidermonkey-17.0.0-r5
@@ -4,12 +4,12 @@ DESCRIPTION=Stand-alone JavaScript C library
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/js/spidermonkey/
 IUSE=debug jit minimal static-libs test
-KEYWORDS=alpha amd64 arm -hppa ia64 -mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 -hppa ia64 -mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.9.4 virtual/libffi >=sys-libs/zlib-1.1.4
 REQUIRED_USE=debug? ( jit )
 RESTRICT=ia64? ( test )
 SLOT=17
 SRC_URI=http://ftp.mozilla.org/pub/mozilla.org/js/mozjs17.0.0.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=652ba3bfeb44a63a2b664de20d5e8db7
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ebdf8e35b57799456cccd5c60927e754
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
similarity index 55%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
index 4765fcf9a6..d67146057e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
@@ -3,10 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/finduti
 DESCRIPTION=library to construct the suffix array and the Burrows-Wheeler transformed string
 EAPI=3
 HOMEPAGE=http://code.google.com/p/libdivsufsort/
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
-RESTRICT=mirror
 SLOT=0
 SRC_URI=http://libdivsufsort.googlecode.com/files/libdivsufsort-2.0.1.tar.gz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7aa4c807d79c02787f33d62ce8691f6f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=28b43a71ca413a77ba8dec480ed56410
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdnet-1.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdnet-1.12
index 828e0150f5..574d942962 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdnet-1.12
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libdnet-1.12
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=simplified network library for /usr/share/oem
 EAPI=5
 HOMEPAGE=http://code.google.com/p/libdnet/
 IUSE=ipv6 static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libdnet.googlecode.com/files/libdnet-1.12.tgz ipv6? ( http://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ed8834cfb0b1f5863cbfe26c9a3fa384
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=9fbbcff750dc09ecfef8fd9bd1ce38ea
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libmspack-0.4_alpha b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libmspack-0.4_alpha
index b0ef67faa1..80ac450ca1 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libmspack-0.4_alpha
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/libmspack-0.4_alpha
@@ -3,8 +3,8 @@ DESCRIPTION=A library for Microsoft compression formats
 EAPI=5
 HOMEPAGE=http://www.cabextract.org.uk/libmspack/
 IUSE=static-libs
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.cabextract.org.uk/libmspack/libmspack-0.4alpha.tar.gz
-_md5_=56b443cd2d8772fb49279bcf5c1da256
+_md5_=5003e340a6182589e7ec9a5b79463831
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1
index 8fbfd1e9cd..641bb9aaf6 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-python/gdata-2.0.14-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/elementtree ) =dev-lang/python-2* =dev-lang/python-2*[ssl]
 SLOT=0
 SRC_URI=http://gdata-python-client.googlecode.com/files/gdata-2.0.14.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d0355ac0473cb3e06e52cbbc160f6159
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5
index d8a2ea69df..616504891f 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/bsdiff-4.3-r5
@@ -3,10 +3,10 @@ DEPEND=app-arch/bzip2 dev-libs/libdivsufsort
 DESCRIPTION=bsdiff: Binary Differencer using a suffix alg
 EAPI=2
 HOMEPAGE=http://www.daemonology.net/bsdiff/
-KEYWORDS=alpha amd64 arm hppa ia64 mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RDEPEND=app-arch/bzip2 dev-libs/libdivsufsort
 SLOT=0
 SRC_URI=http://www.daemonology.net/bsdiff/bsdiff-4.3.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=518d75756c55c3fbf5a9bd3851385b60
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6e4215e4f3d9f08d037209ff08b769bd
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 fde0415667..cd21d9dec5 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
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=configure info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Chromium OS build utilities
 EAPI=2
 HOMEPAGE=http://www.chromium.org/chromium-os
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_fac7e77188abf62a8c29d1aab875e6bc72d892b2 profiling
 KEYWORDS=amd64
 LICENSE=BSD
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _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 feb186bbf1..371539848c 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
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=configure info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Chromium OS build utilities
 EAPI=2
 HOMEPAGE=http://www.chromium.org/chromium-os
@@ -7,5 +7,5 @@ IUSE=cros_workon_tree_* profiling
 KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=85de96d2b95d71d0ee06ed3ec39548ac
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/go-bindata-3.0.5-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/go-bindata-3.0.5-r2
new file mode 100644
index 0000000000..5b0bbc449e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/go-bindata-3.0.5-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.6
+DESCRIPTION=A small utility which generates Go code from any file. Useful for embedding binary data in a Go program.
+EAPI=5
+HOMEPAGE=https://github.com/jteeuwen/go-bindata
+KEYWORDS=amd64 arm64 ~x86
+LICENSE=CC0 1.0 Universal
+SLOT=0
+_eclasses_=coreos-go	d4a4813965bfaf74512500dfc8913714	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git	a673225a1558ef94456dbd8ce271d16a	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=3156073f169657a13cf4990fd29531aa
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9
index eccff19d1c..1af6b336a5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-util/lcov-1.9
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.9.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=046c8370cbaf3cbd9d8d3dc10bb21543
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/repo-1.21 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/repo-1.21
index 981483f3d1..5d08b4c0dd 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/repo-1.21
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-vcs/repo-1.21
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Android's multiple git repository management tool.
 EAPI=5
 HOMEPAGE=https://code.google.com/p/git-repo/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.7.2 app-crypt/gnupg
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.7.2 app-crypt/gnupg
 SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	b63f5ef61876823ab0bd05d867697d75	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d68a30d445f7f570863917a8b6c5c7c1
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=bd6fbf450daf0f2367953416e53200c7
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freetype-2.4.11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freetype-2.4.11
deleted file mode 100644
index 47c695dc42..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/media-libs/freetype-2.4.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A high-quality and portable font engine
-EAPI=4
-HOMEPAGE=http://www.freetype.org/
-IUSE=X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=FTL GPL-2
-RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
-SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.4.11.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.11.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.11.tar.bz2 )
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7bfc11a059ecad55b13f45e94e881cf7
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/nmap-6.40-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/nmap-6.40-r1
index 2c86653998..56a20d2f6a 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/nmap-6.40-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-analyzer/nmap-6.40-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl ) nls? ( sys-devel/gettext )
+DEPEND=dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl ) nls? ( sys-devel/gettext )
 DESCRIPTION=A utility for network exploration or security auditing
 EAPI=5
 HOMEPAGE=http://nmap.org/
 IUSE=ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_zh python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl )
+RDEPEND=dev-libs/libpcre net-libs/libpcap[ipv6?] zenmap? ( dev-python/pygtk:2 || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) lua? ( >=dev-lang/lua-5.2[deprecated] ) ndiff? ( || ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=http://nmap.org/dist/nmap-6.40.tar.bz2 http://dev.gentoo.org/~jer/nmap-logo-64.png
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c703997a9aeb851451389ac39908d16c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.2.9-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.2.9-r4
new file mode 100644
index 0000000000..c774d0fadd
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.2.9-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) uuid? ( sys-apps/util-linux ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=NFS client and server daemons
+EAPI=4
+HOMEPAGE=http://linux-nfs.org/
+IUSE=caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=GPL-2
+RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) uuid? ( sys-apps/util-linux ) !net-nds/portmap
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-1.2.9.tar.bz2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=7f45b016d9b72c6d935294f99fc5c730
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libnfsidmap-0.24-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libnfsidmap-0.24-r1
new file mode 100644
index 0000000000..d79295b6d1
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libnfsidmap-0.24-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ldap? ( net-nds/openldap ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=NFSv4 ID <-> name mapping library
+EAPI=2
+HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
+IUSE=ldap static-libs
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=BSD
+RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
+SLOT=0
+SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.24.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c9b2d53fbde2ab3791c63d2043e2b5ac
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libtirpc-0.2.5-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libtirpc-0.2.5-r1
new file mode 100644
index 0000000000..cd82fa3a0a
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libtirpc-0.2.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=kerberos? ( >=virtual/krb5-0-r1[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(-)?] ) app-arch/xz-utils >=virtual/pkgconfig-0-r1[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(-)?]
+DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
+EAPI=4
+HOMEPAGE=http://libtirpc.sourceforge.net/
+IUSE=ipv6 kerberos static-libs 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=GPL-2
+RDEPEND=kerberos? ( >=virtual/krb5-0-r1[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://sourceforge/libtirpc/libtirpc-0.2.5.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c499b6ab35445d0f36ca6d51571a76b0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1
index a16f5191ac..bb01693bb2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/iperf-2.0.4-r1
@@ -6,5 +6,5 @@ KEYWORDS=amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux
 LICENSE=as-is
 SLOT=0
 SRC_URI=mirror://sourceforge/iperf/iperf-2.0.4.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=61c951b23b2f549a3d864c68cd637e39
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r13 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r13
deleted file mode 100644
index 1aa540e5b7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.6_p5-r13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig
-DESCRIPTION=Network Time Protocol suite/programs
-EAPI=4
-HOMEPAGE=http://www.ntp.org/
-IUSE=caps debug doc examples ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint
-LICENSE=HPND BSD ISC
-PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
-SLOT=0
-SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.6p5.tar.gz mirror://gentoo/ntp-4.2.6p5-manpages.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=12cbb6495bb1456cbc7cb822f6b7df1e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8-r1
deleted file mode 100644
index f0f285dc96..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 >=dev-libs/libevent-2.0.9 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network Time Protocol suite/programs
-EAPI=4
-HOMEPAGE=http://www.ntp.org/
-IUSE=caps debug doc ipv6 openntpd parse-clocks perl samba selinux snmp ssl vim-syntax zeroconf
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint
-LICENSE=HPND BSD ISC
-PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 >=dev-libs/libevent-2.0.9 kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
-SLOT=0
-SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8.tar.gz mirror://gentoo/ntp-4.2.8-manpages.tar.bz2
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=96651b0c53fe85613d81c8d01e812104
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8-r3
new file mode 100644
index 0000000000..078a526d66
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-misc/ntp-4.2.8-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Network Time Protocol suite/programs
+EAPI=4
+HOMEPAGE=http://www.ntp.org/
+IUSE=caps debug ipv6 openntpd parse-clocks perl samba selinux snmp ssl threads vim-syntax zeroconf
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint
+LICENSE=HPND BSD ISC
+PDEPEND=openntpd? ( net-misc/openntpd )
+RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 >=dev-libs/libevent-2.0.9[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )
+SLOT=0
+SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8.tar.gz mirror://gentoo/ntp-4.2.8-manpages.tar.bz2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=957071d58f3bb54eae9ab04581efef10
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-p2p/transmission-2.84 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-p2p/transmission-2.84
index 3b712111e0..00d792e941 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-p2p/transmission-2.84
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-p2p/transmission-2.84
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= net-libs/libnatpmp:= >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) systemd? ( sys-apps/systemd:= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= dev-qt/qtdbus:4= ) >=dev-libs/glib-2.32 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig xfs? ( sys-fs/xfsprogs ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= natpmp? ( net-libs/libnatpmp:= ) miniupnp? ( >=net-libs/miniupnpc-1.7:= ) >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) systemd? ( sys-apps/systemd:= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= dev-qt/qtdbus:4= ) >=dev-libs/glib-2.32 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig xfs? ( sys-fs/xfsprogs ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=5
 HOMEPAGE=http://www.transmissionbt.com/
-IUSE=ayatana gtk lightweight systemd qt4 xfs
+IUSE=ayatana gtk lightweight miniupnp natpmp systemd qt4 xfs
 KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
-RDEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= net-libs/libnatpmp:= >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) systemd? ( sys-apps/systemd:= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= dev-qt/qtdbus:4= )
+RDEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= natpmp? ( net-libs/libnatpmp:= ) miniupnp? ( >=net-libs/miniupnpc-1.7:= ) >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) systemd? ( sys-apps/systemd:= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= dev-qt/qtdbus:4= )
 REQUIRED_USE=ayatana? ( gtk )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.84.tar.xz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	9e0174de733aecba0a7e66b2b01841d2	qt4-r2	7199e3db5b5908325487d379c6f67cf0	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1fdb8804156956f24f1ed2ac05a9c3fe
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	8557b23f27697843c242ff27aaa99448	qt4-r2	7199e3db5b5908325487d379c6f67cf0	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=8ab5e122c233e3e1761ca575901e65bd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.0.11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.0.11
deleted file mode 100644
index 3907451673..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.0.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install postinst setup unpack
-DEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre dev-vcs/git virtual/pkgconfig
-DESCRIPTION=Filesystem baselayout for CoreOS
-EAPI=5
-HOMEPAGE=http://www.coreos.com/
-IUSE=cros_host symlink-usr cros_workon_tree_* profiling
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre sys-apps/efunctions cros_host? ( !coreos-base/coreos-init )
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1e25f1d34b97b3e2c0e962f5f9b84416
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.0.14 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.0.14
new file mode 100644
index 0000000000..f1260a306b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/baselayout-3.0.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile info install postinst setup unpack
+DEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=Filesystem baselayout for CoreOS
+EAPI=5
+HOMEPAGE=http://www.coreos.com/
+IUSE=cros_host symlink-usr cros_workon_tree_* profiling
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre >=sys-apps/gentoo-functions-0.10 cros_host? ( !coreos-base/coreos-init )
+SLOT=0
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e3b23cd43463817bfe712150350988b0
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 dd1c1b4dc9..9559fecbea 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
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile info install postinst setup unpack
-DEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre dev-vcs/git virtual/pkgconfig
+DEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=Filesystem baselayout for CoreOS
 EAPI=5
 HOMEPAGE=http://www.coreos.com/
 IUSE=cros_host symlink-usr cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre sys-apps/efunctions cros_host? ( !coreos-base/coreos-init )
+RDEPEND=sys-apps/systemd !coreos-base/coreos-base !<sys-libs/glibc-2.17-r1 !<=sys-libs/nss-usrfiles-2.18.1_pre >=sys-apps/gentoo-functions-0.10 cros_host? ( !coreos-base/coreos-init )
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1e25f1d34b97b3e2c0e962f5f9b84416
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e3b23cd43463817bfe712150350988b0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.20-r101 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.20-r102
similarity index 87%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.20-r101
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.20-r102
index 9854c5cdf5..b9469e4c6e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.20-r101
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.20-r102
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.15 ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
 SLOT=0
 SRC_URI=mirror://gnu-alpha/coreutils/coreutils-8.20.tar.xz mirror://gnu/coreutils/coreutils-8.20.tar.xz mirror://gentoo/coreutils-8.20.tar.xz mirror://gentoo/coreutils-8.20-patches-1.1.tar.xz http://dev.gentoo.org/~ryao/dist/coreutils-8.20-patches-1.1.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0fa9c027300ea89764de5ca8979cd4e0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=fc3b56ca01d6a4d93431102de79c2508
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.23-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.23-r1
new file mode 100644
index 0000000000..e4d265e5c8
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/coreutils-8.23-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1 static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
+DESCRIPTION=Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/coreutils/
+IUSE=acl caps gmp multicall nls selinux static symlink-usr userland_BSD vanilla xattr
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~arm-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 !<sci-chemistry/ccp4-6.1.1
+SLOT=0
+SRC_URI=mirror://gnu/coreutils/coreutils-8.23.tar.xz mirror://gentoo/coreutils-8.23-patches-1.0.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.23-patches-1.0.tar.xz mirror://gentoo/coreutils-8.23-man.tar.xz http://dev.gentoo.org/~vapier/dist/coreutils-8.23-man.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=caf729297e7a46b28a4ced7a787a948b
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.12 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.12
deleted file mode 100644
index 61bbb9229c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 x11-libs/libXt ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=5
-HOMEPAGE=http://dbus.freedesktop.org/
-IUSE=debug doc selinux static-libs systemd test X test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.12.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=53e05e71dab617050ac5ead07950df44
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.12-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.12-r4
deleted file mode 100644
index 61bbb9229c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.12-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 x11-libs/libXt ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=5
-HOMEPAGE=http://dbus.freedesktop.org/
-IUSE=debug doc selinux static-libs systemd test X test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.12.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=53e05e71dab617050ac5ead07950df44
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.18-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.18-r1
deleted file mode 100644
index b7e2a6175b..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.6.18-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) virtual/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.24 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=5
-HOMEPAGE=http://dbus.freedesktop.org/
-IUSE=debug doc selinux static-libs systemd test X 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 test
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.18.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=158d8c2d1d194ec4b48365fa346e8d0e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.8.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.8.10
deleted file mode 100644
index e1baa3a2b1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.8.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/xmlto app-text/docbook-xml-dtd:4.4 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-libs/glib-2.24 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=5
-HOMEPAGE=http://dbus.freedesktop.org/
-IUSE=debug doc selinux static-libs systemd test X 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 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-dbus )
-SLOT=0
-SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.8.10.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3ef78408f8349685270bf781971bd12a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.8.16-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.8.16-r1
new file mode 100644
index 0000000000..8bc5ef7ad0
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/dbus-1.8.16-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/xmlto app-text/docbook-xml-dtd:4.4 virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-libs/glib-2.24 || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A message bus system, a simple way for applications to talk to each other
+EAPI=5
+HOMEPAGE=http://dbus.freedesktop.org/
+IUSE=debug doc selinux static-libs systemd test X test 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( AFL-2.1 GPL-2 )
+RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-dbus )
+SLOT=0
+SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.8.16.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=8088a5ef11b13cd2a97d5d47402b5575
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/efunctions-1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/efunctions-1
index 1bc3ef4cde..4feea46160 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/efunctions-1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/efunctions-1
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 RDEPEND=!sys-apps/openrc !<sys-apps/baselayout-2.0 !coreos-base/efunctions
 SLOT=0
 SRC_URI=https://github.com/marcusatbang/efunctions/tarball/b35f73e902fc0a6977260a1d6e8b287ae3b1c82a -> efunctions-1.tar.gz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=920916f5c691c606ecc56b7fdc8d6c43
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/gawk-4.0.1-r101 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/gawk-4.0.1-r101
index 35d82e0c32..b0c0ee474a 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/gawk-4.0.1-r101
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/gawk-4.0.1-r101
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/baselayout-2.0.1 readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.0.1.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7d7e8f4ca376cd383de058527941b033
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
new file mode 100644
index 0000000000..069eef5cb4
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/ignition-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install prepare unpack
+DEPEND=dev-lang/go >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
+DESCRIPTION=Pre-boot provisioning utility
+EAPI=5
+HOMEPAGE=https://github.com/coreos/ignition
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64 arm64
+LICENSE=Apache-2.0
+SLOT=0
+_eclasses_=coreos-doc	72164c6190a558664ec3293b6e572055	coreos-go	d4a4813965bfaf74512500dfc8913714	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=07858bee1e4530f67da65799db081bf4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2
index 5652cad7d2..8a0af73716 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iotools-1.2-r2
@@ -6,5 +6,5 @@ KEYWORDS=x86 amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/iotools-1.2.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=622bd785753b621d7210cf24cf074237
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iproute2-3.19.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iproute2-3.19.0
new file mode 100644
index 0000000000..8b4ed4e14b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iproute2-3.19.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.20:= ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) app-arch/xz-utils iptables? ( virtual/pkgconfig ) sys-devel/bison sys-devel/flex >=sys-kernel/linux-headers-2.6.27 elibc_glibc? ( >=sys-libs/glibc-2.7 )
+DESCRIPTION=kernel routing and traffic control utilities
+EAPI=5
+HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
+IUSE=atm berkdb +iptables ipv6 minimal selinux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.20:= ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.19.0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=99ddf1c4d0e3dfb622ac4a7f4ea3b08d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iproute2-3.8.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iproute2-3.8.0
deleted file mode 100644
index ee960fcf09..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/iproute2-3.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm ) app-arch/xz-utils iptables? ( virtual/pkgconfig ) sys-devel/bison sys-devel/flex >=sys-kernel/linux-headers-2.6.27 elibc_glibc? ( >=sys-libs/glibc-2.7 )
-DESCRIPTION=kernel routing and traffic control utilities
-EAPI=4
-HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
-IUSE=atm berkdb +iptables ipv6 minimal
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=!net-misc/arpd iptables? ( >=net-firewall/iptables-1.4.5 ) !minimal? ( berkdb? ( sys-libs/db ) ) atm? ( net-dialup/linux-atm )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-3.8.0.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0198f3833665fcc6ea77ab3f5ab345d2
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1
index 3222754459..7b736842af 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.2.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2fd255706808c37fe82f798284c487fd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3
index 3f82aa8acf..341525f588 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.3.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=61a5132e7c73d802ff4d08d5497b4d4a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1
index 9965e80ced..e7688235fe 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.3.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9702036b153d14edcce16352f2396ee1
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.4-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.4-r1
index 9119b24677..5f18bfe76b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.4-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-2.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kexec/kexec-tools-2.0.4.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ce5c8cb0fdad3abf4fea9304409a66b0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-9999
index 8e81a2bf78..0e598234d7 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/kexec-tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install unpack
-DEPEND=zlib? ( sys-libs/zlib ) dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=zlib? ( sys-libs/zlib ) dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Load another kernel from the currently executing Linux kernel
 EAPI=2
 HOMEPAGE=http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -7,5 +7,5 @@ IUSE=xen zlib
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib )
 SLOT=0
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8d6561593ff2a1c6d9d3e57c3736a1f3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/keyutils-1.5.9-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/keyutils-1.5.9-r2
new file mode 100644
index 0000000000..1292820cc7
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/keyutils-1.5.9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!prefix? ( >=sys-kernel/linux-headers-2.6.11 ) virtual/pkgconfig
+DESCRIPTION=Linux Key Management Utilities
+EAPI=5
+HOMEPAGE=http://people.redhat.com/dhowells/keyutils/
+IUSE=test 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
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://people.redhat.com/dhowells/keyutils/keyutils-1.5.9.tar.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e6fad3ada7f6a676ca5877ade7095270
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.18-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.18-r1
new file mode 100644
index 0000000000..6ed7a1721b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.18-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=!build? ( python_targets_pypy? ( virtual/pypy:0=[ssl(+),bzip2(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ssl(+),bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+),bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python2_7(-)] ) 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(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python2_7(-)]
+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 selinux xattr python_targets_pypy python_targets_python3_3 python_targets_python3_4 python_targets_python2_7
+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=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_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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python2_7(-)] ) 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(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( virtual/pypy:0=[bzip2(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[bzip2(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.2.18.tar.bz2 http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.18.tar.bz2
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=978914006efdecf66c4f0282cfcf839e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.8-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.8-r4
index 5f4effbcd8..b4b8bc77d5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.8-r4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/portage-2.2.8-r4
@@ -10,5 +10,5 @@ PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( virtual/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=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] <sys-libs/libselinux-2.0.94 ) ) xattr? ( kernel_linux? ( python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7] ) python_targets_python3_2? ( dev-python/pyxattr[python_targets_python3_2] ) python_targets_pypy2_0? ( dev-python/pyxattr[python_targets_pypy2_0] ) ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.2.8.tar.bz2 http://dev.gentoo.org/~dolsen/releases/portage/portage-2.2.8.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a85ca8aba43dab0b7b100f1e31556407
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11
index 219eaef111..0be18594cb 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-0.0.1-r11
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Chrome OS root block device tool/library
 EAPI=2
 HOMEPAGE=http://www.chromium.org/
 IUSE=cros_workon_tree_8ec533cfbe40ad80859408561a3623f8b24b909b profiling
-KEYWORDS=amd64 x86 arm
+KEYWORDS=amd64 x86 arm arm64
 LICENSE=BSD
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c338e58bcde48e83acb6be9d13234536
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c2cc0c534d0e907ef395c373061887d0
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999
index 8e6c39b895..0346907019 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/rootdev-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=Chrome OS root block device tool/library
 EAPI=2
 HOMEPAGE=http://www.chromium.org/
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~x86 ~arm
+KEYWORDS=~amd64 ~x86 ~arm ~arm64
 LICENSE=BSD
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=20e26014b1db74e44a8fa79b37ead093
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=f5144c42068e7c25e41afc946ac9b9c9
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.0.1
new file mode 100644
index 0000000000..e3442e14bc
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-2.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure info install prepare test unpack
+DEPEND=!coreos-base/vboot_reference sys-apps/util-linux sys-fs/e2fsprogs !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=CoreOS Disk Utilities (e.g. cgpt)
+EAPI=5
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=BSD
+RDEPEND=!coreos-base/vboot_reference sys-apps/util-linux sys-fs/e2fsprogs
+SLOT=0
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a945ceae0e27a1f5b0fec4cfca917a69
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
new file mode 100644
index 0000000000..6448a658a4
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/seismograph-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure info install prepare test unpack
+DEPEND=!coreos-base/vboot_reference sys-apps/util-linux sys-fs/e2fsprogs !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=CoreOS Disk Utilities (e.g. cgpt)
+EAPI=5
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=!coreos-base/vboot_reference sys-apps/util-linux sys-fs/e2fsprogs
+SLOT=0
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a945ceae0e27a1f5b0fec4cfca917a69
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.5.1-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.5.1-r3
index e1f094b3e7..f5fc49cecd 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.5.1-r3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/shadow-4.1.5.1-r3
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=acl? ( sys-apps/acl ) audit? ( sys-process/audit ) cracklib? ( >=sys-libs/cracklib-2.7-r3 ) pam? ( virtual/pam ) skey? ( sys-auth/skey ) selinux? ( >=sys-libs/libselinux-1.28 sys-libs/libsemanage ) nls? ( virtual/libintl ) xattr? ( sys-apps/attr ) pam? ( >=sys-auth/pambase-20120417 )
 SLOT=0
 SRC_URI=http://pkg-shadow.alioth.debian.org/releases/shadow-4.1.5.1.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ae201b2f869ee6d2cb6f15f1bde02ab3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-215-r16 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-215-r16
deleted file mode 100644
index 459561581d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-215-r16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( dev-libs/glib:2=[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= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( app-arch/xz-utils: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.1:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.10 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl nls test +filecaps 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 python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit )
-RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( dev-libs/glib:2=[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= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( app-arch/xz-utils: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.1:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/udev
-SLOT=0/2
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-215.tar.xz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fcaps	c247b6885e1ff14f794a0eb65fb1e8ec	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=94b5dcd59d33b45c515b12b97f56ff81
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-217-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-217-r5
deleted file mode 100644
index 2c18668136..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-217-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) terminal? ( dev-libs/libevdev:0= >=x11-libs/libxkbcommon-0.4:0= x11-libs/libdrm:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl terminal nls test vanilla 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 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) terminal? ( dev-libs/libevdev:0= >=x11-libs/libxkbcommon-0.4:0= x11-libs/libdrm:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/eudev !sys-fs/udev
-SLOT=0/2
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-217.tar.xz http://dev.gentoo.org/~floppym/dist/systemd-gentoo-patches-217-r1.tar.xz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5810952c5b5cc7fdb5a6cedb3ae87efc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-218-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-218-r2
deleted file mode 100644
index 2c6793117a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-218-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
-DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb nls symlink-usr 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 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/eudev !sys-fs/udev
-SLOT=0/2
-SRC_URI=http://www.freedesktop.org/software/systemd/systemd-218.tar.xz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c24feb94294b291af6088fd8bedbf125
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-220-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-220-r1
new file mode 100644
index 0000000000..ed88c0193c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-220-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure info install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) terminal? ( media-fonts/unifont[utils(+)] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0 >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http idn +importd introspection kdbus +kmod +lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb nls symlink-usr cros_workon_tree_* profiling 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 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+KEYWORDS=amd64 arm64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+SLOT=0/2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=db9357040e0ba285b275691abd9b3bdd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999
index 9defffd586..fef7010f7e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-apps/systemd-9999
@@ -1,12 +1,14 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0 >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure info install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) python? ( dev-python/lxml[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) terminal? ( media-fonts/unifont[utils(+)] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0 >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb nls symlink-usr 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 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+IUSE=acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http idn +importd introspection kdbus +kmod +lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb nls symlink-usr cros_workon_tree_* profiling 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 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !<sys-libs/glibc-2.14 !sys-fs/eudev !sys-fs/udev
+RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) 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(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f880182f5c4cb689f3139f58daddf4df
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=db9357040e0ba285b275691abd9b3bdd
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/polkit-0.112-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/polkit-0.112-r4
similarity index 79%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/polkit-0.112-r3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/polkit-0.112-r4
index 788e016719..635a19462a 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/polkit-0.112-r3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-auth/polkit-0.112-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/polkit
 IUSE=examples gtk +introspection jit kde nls pam selinux systemd
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 lxde-base/lxpolkit ) ) kde? ( sys-auth/polkit-kde-agent ) !systemd? ( sys-auth/consolekit[policykit] )
 RDEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug,jit=] ) ) >=dev-libs/glib-2.32 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) selinux? ( sec-policy/selinux-policykit ) systemd? ( sys-apps/systemd:0= )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a1ed69883cadaf37ada090bf8f7fedb0
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=278fe159d500622f3ef5257f9739f3e5
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20140825-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20140825-r1
index 2abb0ba93c..252cc4e44d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20140825-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20140825-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/l
 RESTRICT=test
 SLOT=2
 SRC_URI=http://storage.core-os.net/mirror/snapshots/grub-2.02~beta2_p20140825.tar.gz 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	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=691bfa56143ec87ef3760410674b1ddb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20141205 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20141205-r1
similarity index 69%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20141205
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20141205-r1
index 702fbfbfe3..9445a0ce02 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20141205
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/grub-2.02_beta2_p20141205-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure info install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=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 ) || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo grub_platforms_coreboot? ( media-libs/freetype:2 ) grub_platforms_qemu? ( media-libs/freetype:2 ) grub_platforms_ieee1275? ( media-libs/freetype:2 ) grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) test? ( dev-libs/libisoburn sys-fs/squashfs-tools[lzo,xz] grub_platforms_efi-64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) grub_platforms_pc? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) truetype? ( app-arch/unzip ) dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=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 ) || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo grub_platforms_coreboot? ( media-libs/freetype:2 ) grub_platforms_qemu? ( media-libs/freetype:2 ) grub_platforms_ieee1275? ( media-libs/freetype:2 ) grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) test? ( dev-libs/libisoburn sys-fs/squashfs-tools[lzo,xz] grub_platforms_efi-64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) grub_platforms_pc? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) truetype? ( app-arch/unzip ) >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU GRUB boot loader
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/grub/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/l
 RESTRICT=test
 SLOT=2
 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	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c42b0ea5c12e25d0683abd118fe6a42b
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3e087d3a57690a1fdc34c7000c652b6c
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 fa6040bbc9..cfef377de9 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
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure info install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=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 ) || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo grub_platforms_coreboot? ( media-libs/freetype:2 ) grub_platforms_qemu? ( media-libs/freetype:2 ) grub_platforms_ieee1275? ( media-libs/freetype:2 ) grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) test? ( dev-libs/libisoburn sys-fs/squashfs-tools[lzo,xz] grub_platforms_efi-64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) grub_platforms_pc? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) truetype? ( app-arch/unzip ) dev-vcs/git !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=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 ) || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo grub_platforms_coreboot? ( media-libs/freetype:2 ) grub_platforms_qemu? ( media-libs/freetype:2 ) grub_platforms_ieee1275? ( media-libs/freetype:2 ) grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] truetype? ( app-arch/bzip2[static-libs(+)] media-libs/freetype[static-libs(+)] sys-libs/zlib[static-libs(+)] ) ) test? ( dev-libs/libisoburn sys-fs/squashfs-tools[lzo,xz] grub_platforms_efi-64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) grub_platforms_pc? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) truetype? ( app-arch/unzip ) >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU GRUB boot loader
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/grub/
@@ -10,5 +10,5 @@ RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/l
 RESTRICT=test
 SLOT=2
 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	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c42b0ea5c12e25d0683abd118fe6a42b
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	mount-boot	02dd3bb4c5f025fef0fc3ade0f27c217	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3e087d3a57690a1fdc34c7000c652b6c
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423
new file mode 100644
index 0000000000..ae768115dd
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-0.8_p20150423
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install unpack
+DEPEND=sys-boot/gnu-efi dev-libs/openssl >=dev-vcs/git-1.8.2.1
+DESCRIPTION=UEFI Shim loader
+EAPI=5
+HOMEPAGE=https://github.com/rhinstaller/shim
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=amd64
+LICENSE=BSD
+SLOT=0
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=11184a5309864d350fbbbf132783058d
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
new file mode 100644
index 0000000000..a61f02db4e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/shim-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile info install unpack
+DEPEND=sys-boot/gnu-efi dev-libs/openssl >=dev-vcs/git-1.8.2.1
+DESCRIPTION=UEFI Shim loader
+EAPI=5
+HOMEPAGE=https://github.com/rhinstaller/shim
+IUSE=cros_workon_tree_* profiling
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=11184a5309864d350fbbbf132783058d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r1
index 81d3d38076..9c789571d5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux sys-fs/mtools perl? ( dev-lang/perl dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/syslinux/4.xx/syslinux-4.07.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a6aaacf1945272683f2c015362afd9ac
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-6.03_pre9 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-6.03_pre9
deleted file mode 100644
index c537bcd65e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-6.03_pre9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-apps/util-linux sys-fs/mtools perl? ( dev-lang/perl dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 ) dev-lang/nasm virtual/os-headers
-DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
-EAPI=5
-HOMEPAGE=http://www.syslinux.org/
-IUSE=custom-cflags +perl
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/util-linux sys-fs/mtools perl? ( dev-lang/perl dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 )
-SLOT=0
-SRC_URI=mirror://kernel/linux/utils/boot/syslinux/Testing/6.03/syslinux-6.03-pre9.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=44a352d1563b6e9cdd696b2e37aec8ea
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/sysroot-wrappers-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/sysroot-wrappers-9999
index d120b265aa..9bbc3f6946 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/sysroot-wrappers-9999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-devel/sysroot-wrappers-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=prepare unpack
-DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
 DESCRIPTION=Build tool wrappers for using custom SYSROOTs
 EAPI=5
 HOMEPAGE=https://github.com/coreos/sysroot-wrappers
 KEYWORDS=-*
 LICENSE=GPL-3
 SLOT=0
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=215069a2740b17dfec19f8859a12a0c3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-16301 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-16301
index 8df377e633..86927e921c 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-16301
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-16301
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=qemu? ( app-emulation/qemu )
 SLOT=0
 SRC_URI=http://storage.core-os.net/mirror/snapshots/edk2-16301.tar.xz mirror://openssl/source/openssl-0.9.8zb.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4b0d72928e96d7db41fe572d75cce7d4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-99999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-99999
index 3241ba9ae5..9c94f87274 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-99999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-firmware/edk2-ovmf-99999
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=qemu? ( app-emulation/qemu )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-0.9.8zb.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4b0d72928e96d7db41fe572d75cce7d4
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3
index 0aa934a584..8f2aeb3599 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-fs/fuse-2.8.6-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse/fuse-2.8.6.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d183f42b5be02d89f014faa3c6a7c252
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.1-r45 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.1-r45
index 7a86710fb1..f591a8f2d1 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.1-r45
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/bootengine-0.0.1-r45
@@ -1,11 +1,11 @@
-DEFINED_PHASES=info install postinst setup unpack
-DEPEND=app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/less sys-apps/sed sys-apps/systemd sys-apps/util-linux sys-fs/btrfs-progs sys-fs/mdadm sys-kernel/dracut virtual/udev dev-vcs/git
+DEFINED_PHASES=info install postinst unpack
+DEPEND=app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/less sys-apps/sed sys-apps/systemd sys-apps/util-linux sys-fs/btrfs-progs sys-fs/mdadm sys-kernel/dracut virtual/udev >=dev-vcs/git-1.8.2.1
 DESCRIPTION=CoreOS Bootengine
 EAPI=5
 IUSE=cros_workon_tree_* profiling cros-debug
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
 RDEPEND=app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/less sys-apps/sed sys-apps/systemd sys-apps/util-linux sys-fs/btrfs-progs sys-fs/mdadm sys-kernel/dracut virtual/udev
 SLOT=0/0.0.1-r45
-_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=df3e40f1d67cb91ea893fdefeec73f2c
+_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=ec83d8713379ddc04c5ad4bc11030ccf
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 8b618afa31..938b6dc2e9 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=info install postinst setup unpack
-DEPEND=app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/less sys-apps/sed sys-apps/systemd sys-apps/util-linux sys-fs/btrfs-progs sys-fs/mdadm sys-kernel/dracut virtual/udev dev-vcs/git
+DEFINED_PHASES=info install postinst unpack
+DEPEND=app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/less sys-apps/sed sys-apps/systemd sys-apps/util-linux sys-fs/btrfs-progs sys-fs/mdadm sys-kernel/dracut virtual/udev >=dev-vcs/git-1.8.2.1
 DESCRIPTION=CoreOS Bootengine
 EAPI=5
 IUSE=cros_workon_tree_* profiling cros-debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-arch/gzip app-shells/bash sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/less sys-apps/sed sys-apps/systemd sys-apps/util-linux sys-fs/btrfs-progs sys-fs/mdadm sys-kernel/dracut virtual/udev
 SLOT=0/9999
-_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=df3e40f1d67cb91ea893fdefeec73f2c
+_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	cros-debug	deb4c0b1259db4d092692c4c46fe072b	cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=ec83d8713379ddc04c5ad4bc11030ccf
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20141009-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20141009-r1
index 08db20790d..dba7129018 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20141009-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20141009-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-kernel/coreos-kernel-3.17.6-r1:= sys-kernel/coreos-sources
 DESCRIPTION=Linux firmware files
 EAPI=5
 HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-KEYWORDS=amd64
+KEYWORDS=amd64 arm64
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
 RDEPEND=>=sys-kernel/coreos-kernel-3.17.6-r1:= !sys-kernel/linux-firmware !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !x11-drivers/radeon-ucode
 SLOT=0
 SRC_URI=mirror://gentoo/linux-firmware-20141009.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=63fd2ce2622ac9ee088ae26ba675c6ad
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b73bcb4a9b0308dccbde87f20d056827
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999
index 190b0c4db4..b7327b6419 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999
@@ -6,5 +6,5 @@ HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
 RDEPEND=>=sys-kernel/coreos-kernel-3.17.6-r1:= !sys-kernel/linux-firmware !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !x11-drivers/radeon-ucode
 SLOT=0
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=63fd2ce2622ac9ee088ae26ba675c6ad
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b73bcb4a9b0308dccbde87f20d056827
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-3.17.7-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-3.17.7-r1
deleted file mode 100644
index f530693f4a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-3.17.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=~sys-kernel/coreos-sources-3.17.7 sys-kernel/bootengine:=
-DESCRIPTION=CoreOS Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org
-KEYWORDS=amd64
-LICENSE=GPL-2 freedist
-RESTRICT=binchecks strip
-SLOT=0/3.17.7-r1
-_eclasses_=coreos-kernel	b131f5cd09c4b0e23ef35c47646885be	eutils	6faef4c127028ccbba3a11400d24ae34	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8a2eef98ce7ab97f149cf28830fc99b5
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-3.18.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-3.18.1
deleted file mode 100644
index 4f50c1b82c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-3.18.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=~sys-kernel/coreos-sources-3.18.1 sys-kernel/bootengine:=
-DESCRIPTION=CoreOS Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org
-KEYWORDS=amd64
-LICENSE=GPL-2 freedist
-RESTRICT=binchecks strip
-SLOT=0/3.18.1
-_eclasses_=coreos-kernel	b131f5cd09c4b0e23ef35c47646885be	eutils	6faef4c127028ccbba3a11400d24ae34	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8a2eef98ce7ab97f149cf28830fc99b5
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.0.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.0.5
new file mode 100644
index 0000000000..a391ea241f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.0.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=~sys-kernel/coreos-sources-4.0.5 sys-kernel/bootengine:=
+DESCRIPTION=CoreOS Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+KEYWORDS=amd64 arm64
+LICENSE=GPL-2 freedist
+RESTRICT=binchecks strip
+SLOT=0/4.0.5
+_eclasses_=coreos-kernel	3b8a3debf7451081536fb0b81641d1ad	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a084026990fbeade49279c659cefdecc
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-3.17.7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-3.17.7
deleted file mode 100644
index 9705b74101..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-3.17.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!sys-kernel/vanilla-sources:3.17.7 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=amd64
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.17.7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.17.7.xz mirror://kernel/linux/kernel/v3.x/linux-3.17.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9504d8754221dbbcbec1e622d97d130d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-3.18.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-3.18.1
deleted file mode 100644
index 5fa360c69e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-3.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=!sys-kernel/vanilla-sources:3.18.1 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org
-IUSE=symlink build
-KEYWORDS=amd64
-LICENSE=GPL-2 freedist
-PDEPEND=!build? ( virtual/dev-manager )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	kernel-2	e0363401e3e385deca89bb9a22b528bb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9504d8754221dbbcbec1e622d97d130d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.0.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.0.5
new file mode 100644
index 0000000000..921460a45b
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-sources-4.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!sys-kernel/vanilla-sources:4.0.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org
+IUSE=symlink build
+KEYWORDS=amd64 arm64
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.0.5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.0.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=255b539bb4843d72c448b2a2e1372c9d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4
index 22eda7a769..8d9839ec3b 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.6.21_p4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1 >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=tcl java doc nocxx doc test examples elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=OracleDB
-RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.6
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	db	217d1394b8ade73a6a416da2b3be3332	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27a7862c5840714fec13b91d34bc4fee
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4
index c50c427db7..2f61d5a41e 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/db-4.7.25_p4-r4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
-DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13 >=sys-devel/automake-1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1 >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Oracle Berkeley DB
 HOMEPAGE=http://www.oracle.com/technology/software/products/berkeley-db/index.html
 IUSE=doc java nocxx tcl test doc test examples elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=OracleDB
-RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	db	217d1394b8ade73a6a416da2b3be3332	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	binutils-funcs	73669d0b20960c1cc54cf381a4b89e77	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5eb807c394541351031be3c9a3bcab2a
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17
index 8f3e07f4e9..f315172c1d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17
@@ -3,11 +3,11 @@ DEPEND=>=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1
 DESCRIPTION=GNU libc6 (also called glibc2) C library
 HOMEPAGE=http://www.gnu.org/software/libc/libc.html
 IUSE=debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.17-patches-8.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=449153ddaea9adb0da57cff08dbbeb4f
+SRC_URI=mirror://gnu/glibc/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.17-patches-8.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a15c03b5ab801be2a7635b1224fbc955
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17-r4
similarity index 68%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17-r3
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17-r4
index 8f3e07f4e9..f315172c1d 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17-r3
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.17-r4
@@ -3,11 +3,11 @@ DEPEND=>=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1
 DESCRIPTION=GNU libc6 (also called glibc2) C library
 HOMEPAGE=http://www.gnu.org/software/libc/libc.html
 IUSE=debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.17-patches-8.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=449153ddaea9adb0da57cff08dbbeb4f
+SRC_URI=mirror://gnu/glibc/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.17.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17.tar.xz mirror://gentoo/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.17-patches-8.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.17-patches-8.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a15c03b5ab801be2a7635b1224fbc955
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.19-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.19-r1
new file mode 100644
index 0000000000..af6524fc25
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.19-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-devel/binutils-2.20 >=sys-devel/gcc-4.3 virtual/os-headers !vanilla? ( >=sys-libs/timezone-data-2012c ) sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc6 (also called glibc2) C library
+HOMEPAGE=http://www.gnu.org/software/libc/libc.html
+IUSE=debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data ) !vanilla? ( sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.19.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.19.tar.xz mirror://gentoo/glibc-2.19.tar.xz mirror://gentoo/glibc-2.19-patches-3.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.19-patches-3.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.19-patches-3.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=aef09115dd6794b547d307f019684051
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.20-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.20-r2
new file mode 100644
index 0000000000..7b9eb7697e
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/glibc-2.20-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 selinux? ( sys-libs/libselinux ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-4.4 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc6 (also called glibc2) C library
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/libc/libc.html
+IUSE=debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
+KEYWORDS=~alpha amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/libselinux ) !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.20.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.20.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.20.tar.xz mirror://gentoo/glibc-2.20.tar.xz mirror://gentoo/glibc-2.20-patches-4.tar.bz2 http://dev.gentoo.org/~vapier/dist/glibc-2.20-patches-4.tar.bz2 http://dev.gentoo.org/~azarah/glibc/glibc-2.20-patches-4.tar.bz2 http://dev.gentoo.org/~blueness/glibc/glibc-2.20-patches-4.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 http://dev.gentoo.org/~blueness/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnuconfig	00a0530e40148c254cebb925df0e87ef	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=318bd701dd39cccf2aedab7525cef385
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0
index e404e3fcef..44dc59feec 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/libbb-1.19.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.busybox.net/downloads/busybox-1.19.0.tar.bz2
-_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=cros-au	f9ae34f03ddcc4a8450e4f603ffef8f8	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5f745c9175ed074d5ae468855ab105da
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r104 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r5
similarity index 61%
rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r104
rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r5
index 0ed1511559..c74e9af5c2 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r104
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/ncurses-5.9-r5
@@ -4,11 +4,11 @@ DESCRIPTION=console display library
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/
 IUSE=ada +cxx debug doc gpm minimal profile static-libs symlink-usr tinfo trace unicode 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
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=MIT
 PDEPEND=gpm? ( sys-libs/gpm[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(-)?] )
 RDEPEND=gpm? ( sys-libs/gpm ) !<x11-terms/rxvt-unicode-9.06-r3 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=074390cc802aca81bedcab157f184fbf
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=7e87b03e0ebc7b2ffc1c5262f710d6bb
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
index c03e85d4d1..3231f71106 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile configure info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=NSS module for data sources under /usr on for CoreOS
 EAPI=5
 HOMEPAGE=https://github.com/coreos/nss-altfiles
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a63b9d1881ec67e43df74484f9c154ef
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a231c00288c43e29a3b33331696ec440
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 90e8bda23e..2259e26ebe 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
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure info install setup unpack
-DEPEND=dev-vcs/git
+DEFINED_PHASES=compile configure info install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
 DESCRIPTION=NSS module for data sources under /usr on for CoreOS
 EAPI=5
 HOMEPAGE=https://github.com/coreos/nss-altfiles
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a63b9d1881ec67e43df74484f9c154ef
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a231c00288c43e29a3b33331696ec440
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/pam-1.1.6-r102 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/pam-1.1.6-r102
index aff882968b..91dcddd5c9 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/pam-1.1.6-r102
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/pam-1.1.6-r102
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend test
-DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) >=sys-devel/libtool-2 sys-devel/flex nls? ( sys-devel/gettext ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Linux-PAM (Pluggable Authentication Modules)
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/linux-pam/
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( virtual/libintl ) cracklib? ( >=sys-libs/cracklib-2.8.3 ) audit? ( sys-process/audit ) selinux? ( >=sys-libs/libselinux-1.28 ) berkdb? ( sys-libs/db ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.1.6.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.1.6-docs.tar.bz2
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79d2bc46c17099683aed473c131be224
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1
index 3fb4e551da..c193adacce 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fcccf968b25b2db2ad3378f9848f440d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1-r1
index 3fb4e551da..c193adacce 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/talloc-2.0.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Samba talloc library
 EAPI=2
 HOMEPAGE=http://talloc.samba.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	6faef4c127028ccbba3a11400d24ae34	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	confutils	2ab69b52fa6ea0c0669a47fb94b354b4	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fcccf968b25b2db2ad3378f9848f440d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2013d b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2013d
deleted file mode 100644
index bfa111d5b7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2013d
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
-IUSE=nls elibc_FreeBSD elibc_glibc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD public-domain
-RDEPEND=!<sys-libs/glibc-2.3.5
-SLOT=0
-SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2013d.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2013d.tar.gz ftp://munnari.oz.au/pub/tzdata2013d.tar.gz ftp://munnari.oz.au/pub/tzcode2013d.tar.gz
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=89bc5ed8d42ed2121a005e47dafd6d12
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2015b-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2015b-r1
new file mode 100644
index 0000000000..6a9fa53fa8
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-libs/timezone-data-2015b-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=4
+HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
+IUSE=nls right_timezone elibc_FreeBSD elibc_glibc
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD public-domain
+RDEPEND=!sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2015b.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2015b.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=fd09137b5c754d375547174f8737dc9e
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5
index 692f80d925..d1c419cb6f 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.5
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/protobuf-c
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openvz.org/criu/criu-0.5.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f0065f92f9919254026ec0219a650721
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6
index 8331bcc16d..83cd4a0cc5 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/criu-0.6
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/protobuf-c
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.openvz.org/criu/criu-0.6.tar.bz2
-_eclasses_=eutils	6faef4c127028ccbba3a11400d24ae34	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f2d1e370a9b64811e969cb9dfcb428ec
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17
index 5e31ca0470..4c63539552 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-process/ktop-0.0.1-r17
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=sys-libs/ncurses dev-vcs/git
+DEFINED_PHASES=compile info install unpack
+DEPEND=sys-libs/ncurses >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Utility for looking at top users of system calls
 EAPI=2
 HOMEPAGE=http://git.chromium.org/gitweb/?s=ktop
 IUSE=cros_workon_tree_df952e3d5bb2f168ccde7a5a1e8684e9b87a078e profiling
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fd964b154bfdc867abef7921032a7312
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=3affe74b2ec255e36ec5f07979108951
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 b40e472c6c..08eac54891 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
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile info install setup unpack
-DEPEND=sys-libs/ncurses dev-vcs/git
+DEFINED_PHASES=compile info install unpack
+DEPEND=sys-libs/ncurses >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Utility for looking at top users of system calls
 EAPI=2
 HOMEPAGE=http://git.chromium.org/gitweb/?s=ktop
 IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses
 SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1f94f3c58f707f9d8b6fd8136461fd41
+_eclasses_=cros-workon	95ff57bae980ffcda8051a50f820179c	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=8cca8346f374fea4f4ae5d9609862690
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-2-r1
index d11c409dc3..079681cb12 100644
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-2-r1
+++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/virtual/linux-sources-2-r1
@@ -3,8 +3,8 @@ DESCRIPTION=CoreOS Kernel virtual package
 EAPI=2
 HOMEPAGE=http://www.coreos.com
 IUSE=cros_host
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=!cros_host? ( sys-kernel/coreos-kernel )
 SLOT=0
-_md5_=f78911361a2303210622cbf68d62e5ee
+_md5_=be5f991b71c893e23e5d03f6e241c3f2