diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
index 9bb452f265..ba9f811ff2 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild
@@ -45,7 +45,6 @@ RDEPEND="${RDEPEND}
 	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
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch
deleted file mode 100644
index 29b9c6208f..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index 11219ed..41d12a6 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -31,7 +31,7 @@ def common_env():
-     env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
-   # Fix issue with scons not passing some vars through the environment.
--  for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
-+  for key in Split('PATH PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
-     if os.environ.has_key(key):
-       env['ENV'][key] = os.environ[key]
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild
deleted file mode 100644
index 372f32eccb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r152.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="f4ecd4c82cf85c0c34bbd6db1af645758491dc36"
-CROS_WORKON_TREE="0e93b9386777f1606fb731bee338820c54d6b9b9"
-CROS_WORKON_PROJECT="chromiumos/platform/libchromeos"
-CROS_WORKON_LOCALNAME="../common" # FIXME: HACK
-
-LIBCHROME_VERS=( 125070 )
-
-inherit toolchain-funcs cros-debug cros-workon scons-utils
-
-DESCRIPTION="Chrome OS base library."
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="cros_host test"
-
-LIBCHROME_DEPEND=$(
-	printf \
-		'coreos-base/libchrome:%s[cros-debug=] ' \
-		${LIBCHROME_VERS[@]}
-)
-RDEPEND="${LIBCHROME_DEPEND}
-	dev-libs/dbus-c++
-	dev-libs/dbus-glib
-	dev-libs/openssl
-	dev-libs/protobuf"
-
-DEPEND="${RDEPEND}
-	coreos-base/protofiles
-	test? ( dev-cpp/gtest )
-	cros_host? ( dev-util/scons )"
-
-cr_scons() {
-	local v=$1; shift
-	BASE_VER=${v} escons -C ${v} -Y "${S}" "$@"
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
-	cros-debug-add-NDEBUG
-	export CCFLAGS="$CFLAGS"
-
-	local v
-	mkdir -p ${LIBCHROME_VERS[@]}
-	for v in ${LIBCHROME_VERS[@]} ; do
-		cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so
-	done
-}
-
-src_test() {
-	local v
-	for v in ${LIBCHROME_VERS[@]} ; do
-		cr_scons ${v} unittests libpolicy_unittest
-		if ! use x86 && ! use amd64 ; then
-			ewarn "Skipping unit tests on non-x86 platform"
-		else
-			./${v}/unittests || die "libchromeos-${v} failed"
-			./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed"
-		fi
-	done
-}
-
-src_install() {
-	local v
-	insinto /usr/$(get_libdir)/pkgconfig
-	for v in ${LIBCHROME_VERS[@]} ; do
-		dolib.so ${v}/lib{chromeos,policy}*-${v}.so
-		doins ${v}/libchromeos-${v}.pc
-	done
-
-	insinto /usr/include/chromeos
-	doins chromeos/*.h
-
-	insinto /usr/include/chromeos/dbus
-	doins chromeos/dbus/*.h
-
-	insinto /usr/include/chromeos/glib
-	doins chromeos/glib/*.h
-
-	insinto /usr/include/policy
-	doins chromeos/policy/*.h
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild
deleted file mode 100644
index f04ec68359..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_COMMIT="6e8f24e5f10aeba2feb9d72a49f276fc0f2ed7de"
-CROS_WORKON_TREE="4677180b651268e80a28763a89399281ec778d46"
-CROS_WORKON_PROJECT="chromiumos/platform/libchromeos"
-
-LIBCHROME_VERS=( 180609 )
-
-inherit eutils toolchain-funcs cros-debug cros-workon scons-utils
-
-DESCRIPTION="Chrome OS base library."
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="cros_host test"
-
-LIBCHROME_DEPEND=$(
-	printf \
-		'coreos-base/libchrome:%s[cros-debug=] ' \
-		${LIBCHROME_VERS[@]}
-)
-RDEPEND="${LIBCHROME_DEPEND}
-	dev-libs/dbus-c++
-	dev-libs/dbus-glib
-	dev-libs/openssl
-	dev-libs/protobuf"
-
-DEPEND="${RDEPEND}
-	coreos-base/protofiles
-	test? ( dev-cpp/gtest )
-	cros_host? ( dev-util/scons )"
-
-cr_scons() {
-	local v=$1; shift
-	BASE_VER=${v} escons -C ${v} -Y "${S}" "$@"
-}
-
-src_prepare() {
-    epatch "${FILESDIR}/${P}-preserve-path.patch"
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
-	cros-debug-add-NDEBUG
-	export CCFLAGS="$CFLAGS"
-
-	local v
-	mkdir -p ${LIBCHROME_VERS[@]}
-	for v in ${LIBCHROME_VERS[@]} ; do
-		cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so
-	done
-}
-
-src_test() {
-	local v
-	for v in ${LIBCHROME_VERS[@]} ; do
-		cr_scons ${v} unittests libpolicy_unittest
-		if ! use x86 && ! use amd64 ; then
-			ewarn "Skipping unit tests on non-x86 platform"
-		else
-			./${v}/unittests || die "libchromeos-${v} failed"
-			./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed"
-		fi
-	done
-}
-
-src_install() {
-	local v
-	insinto /usr/$(get_libdir)/pkgconfig
-	for v in ${LIBCHROME_VERS[@]} ; do
-		dolib.so ${v}/lib{chromeos,policy}*-${v}.so
-		doins ${v}/libchromeos-${v}.pc
-	done
-
-	insinto /usr/include/chromeos
-	doins chromeos/*.h
-
-	insinto /usr/include/chromeos/dbus
-	doins chromeos/dbus/*.h
-
-	insinto /usr/include/chromeos/glib
-	doins chromeos/glib/*.h
-
-	insinto /usr/include/policy
-	doins chromeos/policy/*.h
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild
deleted file mode 100644
index 6dfdc2806e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-CROS_WORKON_PROJECT="chromiumos/platform/libchromeos"
-
-LIBCHROME_VERS=( 180609 )
-
-inherit toolchain-funcs cros-debug cros-workon scons-utils
-
-DESCRIPTION="Chrome OS base library."
-HOMEPAGE="http://www.chromium.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cros_host test"
-
-LIBCHROME_DEPEND=$(
-	printf \
-		'coreos-base/libchrome:%s[cros-debug=] ' \
-		${LIBCHROME_VERS[@]}
-)
-RDEPEND="${LIBCHROME_DEPEND}
-	dev-libs/dbus-c++
-	dev-libs/dbus-glib
-	dev-libs/openssl
-	dev-libs/protobuf"
-
-DEPEND="${RDEPEND}
-	coreos-base/protofiles
-	test? ( dev-cpp/gtest )
-	cros_host? ( dev-util/scons )"
-
-cr_scons() {
-	local v=$1; shift
-	BASE_VER=${v} escons -C ${v} -Y "${S}" "$@"
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
-	cros-debug-add-NDEBUG
-	export CCFLAGS="$CFLAGS"
-
-	local v
-	mkdir -p ${LIBCHROME_VERS[@]}
-	for v in ${LIBCHROME_VERS[@]} ; do
-		cr_scons ${v} libchromeos-${v}.{pc,so} libpolicy-${v}.so
-	done
-}
-
-src_test() {
-	local v
-	for v in ${LIBCHROME_VERS[@]} ; do
-		cr_scons ${v} unittests libpolicy_unittest
-		if ! use x86 && ! use amd64 ; then
-			ewarn "Skipping unit tests on non-x86 platform"
-		else
-			./${v}/unittests || die "libchromeos-${v} failed"
-			./${v}/libpolicy_unittest || die "libpolicy_unittest-${v} failed"
-		fi
-	done
-}
-
-src_install() {
-	local v
-	insinto /usr/$(get_libdir)/pkgconfig
-	for v in ${LIBCHROME_VERS[@]} ; do
-		dolib.so ${v}/lib{chromeos,policy}*-${v}.so
-		doins ${v}/libchromeos-${v}.pc
-	done
-
-	insinto /usr/include/chromeos
-	doins chromeos/*.h
-
-	insinto /usr/include/chromeos/dbus
-	doins chromeos/dbus/*.h
-
-	insinto /usr/include/chromeos/glib
-	doins chromeos/glib/*.h
-
-	insinto /usr/include/policy
-	doins chromeos/policy/*.h
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-0.0.1-r206.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-0.0.1-r206.ebuild
deleted file mode 100644
index 217b87adcc..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-0.0.1-r206.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_COMMIT="6ead34613a4a1ac1911af2ecbbddd204d15305ab"
-CROS_WORKON_TREE="e162130e96a41a9e0d05952a065aaf42e3b969c9"
-CROS_WORKON_PROJECT="chromiumos/platform/system_api"
-
-inherit cros-workon toolchain-funcs
-
-DESCRIPTION="Chrome OS system API (D-Bus service names, etc.)"
-HOMEPAGE="http://www.chromium.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-# Likewise, block libchromeos-0.0.1-r78 or older, that installs
-# dbus/service_constants.h. TODO(satorux): Remove this after a month.
-RDEPEND="!<=chromeos-base/libchromeos-0.0.1-r78"
-
-DEPEND="${RDEPEND}"
-
-CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})"
-
-src_install() {
-	insinto /usr/include/chromeos/dbus
-	doins -r dbus/*
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-9999.ebuild
deleted file mode 100644
index 63ee12f1d1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/system_api/system_api-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_PROJECT="chromiumos/platform/system_api"
-
-inherit cros-workon toolchain-funcs
-
-DESCRIPTION="Chrome OS system API (D-Bus service names, etc.)"
-HOMEPAGE="http://www.chromium.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-# Likewise, block libchromeos-0.0.1-r78 or older, that installs
-# dbus/service_constants.h. TODO(satorux): Remove this after a month.
-RDEPEND="!<=chromeos-base/libchromeos-0.0.1-r78"
-
-DEPEND="${RDEPEND}"
-
-CROS_WORKON_LOCALNAME="$(basename ${CROS_WORKON_PROJECT})"
-
-src_install() {
-	insinto /usr/include/chromeos/dbus
-	doins -r dbus/*
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r412.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r413.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r412.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r413.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
index f288c6146a..147cef223f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild
@@ -8,14 +8,14 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="fa62c26931c3650c6ceb28a3028e167d30985490"
+	CROS_WORKON_COMMIT="e2d68d8eb56450982e53bc0703c11f41b653dcd5"
 	KEYWORDS="amd64 arm x86"
 fi
 
 inherit flag-o-matic toolchain-funcs cros-debug cros-workon scons-utils systemd
 
-DESCRIPTION="Chrome OS Update Engine"
-HOMEPAGE="http://www.chromium.org/"
+DESCRIPTION="CoreOS OS Update Engine"
+HOMEPAGE="https://github.com/coreos/update_engine"
 SRC_URI=""
 
 LICENSE="BSD"
@@ -28,7 +28,6 @@ RDEPEND="!coreos-base/coreos-installer
 	app-arch/bzip2
 	coreos-base/coreos-au-key
 	coreos-base/libchrome:${LIBCHROME_VERS}[cros-debug=]
-	coreos-base/libchromeos
 	dev-cpp/gflags
 	dev-libs/dbus-glib
 	dev-libs/glib
@@ -38,8 +37,7 @@ RDEPEND="!coreos-base/coreos-installer
 	dev-util/bsdiff
 	net-misc/curl
 	sys-fs/e2fsprogs"
-DEPEND="coreos-base/system_api
-	dev-cpp/gmock
+DEPEND="dev-cpp/gmock
 	dev-cpp/gtest
 	cros_host? ( dev-util/scons )
 	${RDEPEND}"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-0.0.2-r37.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-0.0.2-r37.ebuild
deleted file mode 100644
index fc0603ef7a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-0.0.2-r37.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_COMMIT="7104857773f790a549d399715482fa23d9b736cd"
-CROS_WORKON_TREE="6ce294bb88229f44567404a1a5a9cd1b89157724"
-CROS_WORKON_PROJECT="chromiumos/third_party/dbus-cplusplus"
-
-inherit toolchain-funcs cros-workon
-
-DESCRIPTION="C++ D-Bus bindings"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B"
-SRC_URI=""
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="debug doc +glib"
-KEYWORDS="amd64 x86 arm"
-
-RDEPEND="
-	glib? ( >=dev-libs/dbus-glib-0.76 )
-	glib? ( >=dev-libs/glib-2.19:2 )
-	>=sys-apps/dbus-1.0
-        >=dev-cpp/ctemplate-1.0"
-DEPEND="${DEPEND}
-	doc? ( dev-libs/libxslt )
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-hack-Makefile.am-explicit-lpthread-to-fix-pthread.patch"
-	./bootstrap || die "failed to bootstrap autotools"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable glib glib) || die "failed to congfigure"
-}
-
-src_compile() {
-	append-flags -fPIC 
-	emake || die "failed to compile dbus-c++"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to make"
-	dodoc AUTHORS ChangeLog NEWS README || die "failed to intall doc"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-9999.ebuild
deleted file mode 100644
index 0fa08d3d16..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/dbus-c++-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-CROS_WORKON_PROJECT="chromiumos/third_party/dbus-cplusplus"
-
-inherit toolchain-funcs cros-workon
-
-DESCRIPTION="C++ D-Bus bindings"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B"
-SRC_URI=""
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="debug doc +glib"
-KEYWORDS="~amd64 ~x86 ~arm"
-
-RDEPEND="
-	glib? ( >=dev-libs/dbus-glib-0.76 )
-	glib? ( >=dev-libs/glib-2.19:2 )
-	>=sys-apps/dbus-1.0
-        >=dev-cpp/ctemplate-1.0"
-DEPEND="${DEPEND}
-	doc? ( dev-libs/libxslt )
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	./bootstrap || die "failed to bootstrap autotools"
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable glib glib) || die "failed to congfigure"
-}
-
-src_compile() {
-	emake || die "failed to compile dbus-c++"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to make"
-	dodoc AUTHORS ChangeLog NEWS README || die "failed to intall doc"
-}
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/files/dbus-c++-hack-Makefile.am-explicit-lpthread-to-fix-pthread.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/files/dbus-c++-hack-Makefile.am-explicit-lpthread-to-fix-pthread.patch
deleted file mode 100644
index 2d9dce8675..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-c++/files/dbus-c++-hack-Makefile.am-explicit-lpthread-to-fix-pthread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9194e1425aebcfd7b1d3bf218de4430853dc9e37 Mon Sep 17 00:00:00 2001
-From: Brandon Philips <brandon@ifup.co>
-Date: Mon, 4 Mar 2013 13:15:29 -0800
-Subject: [PATCH] hack(Makefile.am): explicit -lpthread to fix pthread
-
-for some reason pthread_LIBS isn't getting populated. I am not terribly
-interested in hunting this down quite yet so hack it for now.
-
-Change-Id: Id18dba7b2d1d9004478d3bc736436628c971f284
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 709ba19..ab7d7de 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -43,7 +43,7 @@ lib_include_HEADERS = $(HEADER_FILES)
- 
- lib_LTLIBRARIES = libdbus-c++-1.la
- libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP)
--libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(glib_LIBS) $(pthread_LIBS) $(ecore_LIBS)
-+libdbus_c___1_la_LIBADD = -lpthread $(pthread_LIBS) $(dbus_LIBS) $(glib_LIBS) $(ecore_LIBS)
- 
- MAINTAINERCLEANFILES = \
- 	Makefile.in
--- 
-1.8.1
-
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152
deleted file mode 100644
index 35cc75a01d..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r152
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install setup test unpack
-DEPEND=coreos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf coreos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons
-DESCRIPTION=Chrome OS base library.
-EAPI=4
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_host test cros-debug cros_workon_tree_0e93b9386777f1606fb731bee338820c54d6b9b9 profiling
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=coreos-base/libchrome:125070[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf
-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
-_md5_=c183f68464e71f403eff46203368228f
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160
deleted file mode 100644
index bb4cfa4e81..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-0.0.1-r160
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install prepare setup test unpack
-DEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf coreos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons
-DESCRIPTION=Chrome OS base library.
-EAPI=4
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_host test cros-debug cros_workon_tree_4677180b651268e80a28763a89399281ec778d46 profiling
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf
-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
-_md5_=1662b43d9a80cdb8d10cd9480d56afed
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999
deleted file mode 100644
index 2087b5c1a4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchromeos-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile info install setup test unpack
-DEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf coreos-base/protofiles test? ( dev-cpp/gtest ) cros_host? ( dev-util/scons ) dev-vcs/git dev-util/scons
-DESCRIPTION=Chrome OS base library.
-EAPI=4
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_host test cros-debug cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=coreos-base/libchrome:180609[cros-debug=] dev-libs/dbus-c++ dev-libs/dbus-glib dev-libs/openssl dev-libs/protobuf
-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
-_md5_=209e3164f9488818e256e7b393ff393b
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/system_api-0.0.1-r206 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/system_api-0.0.1-r206
deleted file mode 100644
index b74cf22400..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/system_api-0.0.1-r206
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=!<=chromeos-base/libchromeos-0.0.1-r78 dev-vcs/git
-DESCRIPTION=Chrome OS system API (D-Bus service names, etc.)
-EAPI=2
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_workon_tree_e162130e96a41a9e0d05952a065aaf42e3b969c9 profiling
-KEYWORDS=amd64 arm x86
-LICENSE=BSD
-RDEPEND=!<=chromeos-base/libchromeos-0.0.1-r78
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e537ca239432ed52d60f8f5ea6f3445d
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/system_api-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/system_api-9999
deleted file mode 100644
index a8e950c9b0..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/system_api-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=info install setup unpack
-DEPEND=!<=chromeos-base/libchromeos-0.0.1-r78 dev-vcs/git
-DESCRIPTION=Chrome OS system API (D-Bus service names, etc.)
-EAPI=2
-HOMEPAGE=http://www.chromium.org/
-IUSE=cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=!<=chromeos-base/libchromeos-0.0.1-r78
-SLOT=0
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5d6af7986efe5eccc99429ae002311ef
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-0.0.2-r37 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-0.0.2-r37
deleted file mode 100644
index 29221538e9..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-0.0.2-r37
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup unpack
-DEPEND=doc? ( dev-libs/libxslt ) doc? ( app-doc/doxygen ) dev-util/pkgconfig dev-vcs/git
-DESCRIPTION=C++ D-Bus bindings
-EAPI=2
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B
-IUSE=debug doc +glib cros_workon_tree_6ce294bb88229f44567404a1a5a9cd1b89157724 profiling
-KEYWORDS=amd64 x86 arm
-LICENSE=LGPL-2
-RDEPEND=glib? ( >=dev-libs/dbus-glib-0.76 ) glib? ( >=dev-libs/glib-2.19:2 ) >=sys-apps/dbus-1.0 >=dev-cpp/ctemplate-1.0
-SLOT=1
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ede450037ec66481cbd1612d53f33ba3
diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-9999
deleted file mode 100644
index 31bc4acae4..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/dev-libs/dbus-c++-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure info install prepare setup unpack
-DEPEND=doc? ( dev-libs/libxslt ) doc? ( app-doc/doxygen ) dev-util/pkgconfig dev-vcs/git
-DESCRIPTION=C++ D-Bus bindings
-EAPI=2
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/dbus-c%2B%2B
-IUSE=debug doc +glib cros_workon_tree_* profiling
-KEYWORDS=~amd64 ~x86 ~arm
-LICENSE=LGPL-2
-RDEPEND=glib? ( >=dev-libs/dbus-glib-0.76 ) glib? ( >=dev-libs/glib-2.19:2 ) >=sys-apps/dbus-1.0 >=dev-cpp/ctemplate-1.0
-SLOT=1
-_eclasses_=cros-workon	371c4d0af591fe21f1a019af07137224	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	git-2	e28f0d8a9b321431b1e699782851b827	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a1d057e118dd29111edda92b9f5d616d
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
index f3d40f9d59..f1d80baa9d 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -8,7 +8,6 @@
 =app-crypt/nss-3.14 -* ~arm ~x86 ~amd64
 
 =dev-python/ws4py-0.2.4 ~amd64
-=dev-libs/dbus-c++-0.9.0-r1 ~amd64
 =dev-embedded/smdk-dltool-0.20-r3 ~amd64
 =sys-fs/libfat-0.3a ~amd64
 =dev-cpp/gflags-2.0 ~amd64