Sync chrome source in parallel

chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild

Index: chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
index 5eba325762889748dd9ed0f096e85d9ba0c20001..bce05b9951bead57d0f9a0e117c8e1646a0d2965 100755
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-9999.ebuild
@@ -23,7 +23,6 @@ inherit eutils multilib toolchain-funcs flag-o-matic autotest
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
 SRC_URI=""
-EGCLIENT_REPO_URI="WE USE A GCLIENT TEMPLATE FILE IN THIS DIRECTORY"
 
 if [ "$PV" = "9999" ]; then
 	KEYWORDS="~x86 ~arm"
@@ -300,7 +299,9 @@ src_unpack() {
 			die "Cannot chdir to ${ECHROME_STORE_DIR}"
 
 		elog "Syncing google chrome sources using ${EGCLIENT}"
-		${EGCLIENT} sync --nohooks --delete_unversioned_trees \
+		# We use --force to work around a race condition with 
+		# checking out cros.git in parallel with the main chrome tree.
+		${EGCLIENT} sync --jobs 8 --nohooks --delete_unversioned_trees --force \
 			|| die "${EGCLIENT} sync failed"
 
 		elog "set the LOCAL_SOURCE to  ${ECHROME_STORE_DIR}"
@@ -416,7 +417,7 @@ src_compile() {
 	if use x86 && use gold; then
 		# List all gold binutils and pick the latest
 		GOLDLOC=$(
-	echo /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/binutils-bin/*-gold | \
+	echo /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/binutils-bin/*/*-gold | \
 	tail -n 1)
 
 		# GOLDLOC will either be the latest gold version or string with *