diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild
index ceee1eeb98..f65c577972 100644
--- a/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild
@@ -1,9 +1,10 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
-CROS_WORKON_COMMIT="6c2d8194633ffe128f3afbc094a03ef22bd29a8a"
-CROS_WORKON_TREE="3fac66aefc84fb25e5359292e9153c676ccbbf6f"
 
 EAPI=2
+
+CROS_WORKON_COMMIT="6c2d8194633ffe128f3afbc094a03ef22bd29a8a"
+CROS_WORKON_TREE="3fac66aefc84fb25e5359292e9153c676ccbbf6f"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME=../third_party/autotest
 CROS_WORKON_SUBDIR=files
diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild
index cc1d3ec52a..0f264faa5d 100644
--- a/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/brcmfmac-nvram/brcmfmac-nvram-0.0.1-r1.ebuild
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-inherit confutils
-
 EAPI="2"
 
+inherit confutils
+
 DESCRIPTION="NVRAM image for the brcmfmac driver"
 HOMEPAGE="http://src.chromium.org"
 SRC_URI=""
diff --git a/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild
index 411a7b4d69..174ffcdab8 100644
--- a/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/chromeos-base/protofiles/protofiles-0.0.1-r11.ebuild
@@ -6,12 +6,13 @@
 # project. It is not cros-work-able if changes to the protobufs are needed
 # these should be done in the Chromium repository.
 
+EAPI="2"
+
 EGIT_REPO_SERVER="http://git.chromium.org"
 EGIT_REPO_URI="${EGIT_REPO_SERVER}/chromium/src/chrome/browser/policy/proto.git"
 EGIT_PROJECT="proto"
 EGIT_COMMIT="18f481b411ea0a861f0879af2065effce0e1fe6c"
 
-EAPI="2"
 inherit git
 
 DESCRIPTION="Protobuf installer for the device policy proto definitions."
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild
index ceee1eeb98..f65c577972 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/autotest-deps-glmark2/autotest-deps-glmark2-0.0.1-r364.ebuild
@@ -1,9 +1,10 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
-CROS_WORKON_COMMIT="6c2d8194633ffe128f3afbc094a03ef22bd29a8a"
-CROS_WORKON_TREE="3fac66aefc84fb25e5359292e9153c676ccbbf6f"
 
 EAPI=2
+
+CROS_WORKON_COMMIT="6c2d8194633ffe128f3afbc094a03ef22bd29a8a"
+CROS_WORKON_TREE="3fac66aefc84fb25e5359292e9153c676ccbbf6f"
 CROS_WORKON_PROJECT="chromiumos/third_party/autotest"
 CROS_WORKON_LOCALNAME=../third_party/autotest
 CROS_WORKON_SUBDIR=files
diff --git a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild
index e69a5b84d7..b930180da6 100644
--- a/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/media-libs/mesa/mesa-9.0-r5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.ebuild,v 1.3 2010/12/05 17:19:14 arfrever Exp $
-CROS_WORKON_COMMIT="fc2cf1403860ebc8769dfa36cf7dcdebc1baa305"
-CROS_WORKON_TREE="9fac2f50764a0dd604f1d1c3458343cedc871d1d"
 
 EAPI=4
 
+CROS_WORKON_COMMIT="fc2cf1403860ebc8769dfa36cf7dcdebc1baa305"
+CROS_WORKON_TREE="9fac2f50764a0dd604f1d1c3458343cedc871d1d"
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 CROS_WORKON_PROJECT="chromiumos/third_party/mesa"
 CROS_WORKON_LOCALNAME="../third_party/mesa"