From 710a7d15e2cb5296a074e515a91b245e47f09d66 Mon Sep 17 00:00:00 2001
From: David James <davidjames@google.com>
Date: Wed, 21 Dec 2011 15:57:02 -0800
Subject: [PATCH] Remove hacks for supporting old versions of emerge from
 build_packages.

Now that emerge supports the flags needed to build packages, we don't
need to special-case it anymore.

BUG=chromium-os:24497
TEST=Trybot run.

Change-Id: I4ca1cd22c309f97fc14f1d7b9eede9128b7f0be1
Reviewed-on: https://gerrit.chromium.org/gerrit/13389
Reviewed-by: Brian Harring <ferringb@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
---
 build_packages | 60 ++++++++++++++------------------------------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/build_packages b/build_packages
index edde767010..c529f4f03d 100755
--- a/build_packages
+++ b/build_packages
@@ -112,11 +112,6 @@ fi
 
 if [[ "${FLAGS_jobs}" -ne -1 ]]; then
   EMERGE_JOBS="--jobs=${FLAGS_jobs}"
-  if [[ "${FLAGS_retries}" -eq -1 ]]; then
-    # The jobs flag can be flaky. Retry once by default,
-    # without the jobs flag.
-    FLAGS_retries=1
-  fi
 fi
 
 if [[ "${FLAGS_withdebug}" -eq "${FLAGS_FALSE}" ]]; then
@@ -175,46 +170,23 @@ if ! OUTPUT=$(emerge-${FLAGS_board} -pe --backtrack=0 ${PACKAGES} 2>&1); then
   die "emerge detected broken ebuilds. See error message above."
 fi
 
-if [[ "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]]; then
-  # These flags are specific to parallel_emerge
-  for pkg in ${CROS_WORKON_PKGS}; do
-    EMERGE_FLAGS="${EMERGE_FLAGS} --workon=${pkg}"
-  done
-  if [[ "${FLAGS_norebuild}" -eq "${FLAGS_FALSE}" ]]; then
-    EMERGE_FLAGS="${EMERGE_FLAGS} --rebuild"
-  fi
-  if [[ "${FLAGS_showoutput}" -eq "${FLAGS_TRUE}" ]]; then
-    EMERGE_FLAGS="${EMERGE_FLAGS} --show-output"
-  fi
-  if [[ "${FLAGS_oldchromebinary}" -eq "${FLAGS_TRUE}" ]]; then
-    EMERGE_FLAGS="${EMERGE_FLAGS} --force-remote-binary=chromeos-chrome"
-    EMERGE_FLAGS="${EMERGE_FLAGS} --force-remote-binary=libcros"
-  fi
-  eretry sudo -E ${EMERGE_BOARD_CMD} -uDNv ${EMERGE_FLAGS} ${PACKAGES}
-else
-  echo "Building ${PACKAGES} ${CROS_WORKON_PKGS}"
-  if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]]; then
-    # Merge all packages, including binary versions of packages.
-    eretry ${EMERGE_BOARD_CMD} -uDNv ${EMERGE_FLAGS} ${PACKAGES}
-    if [[ -n "${CROS_WORKON_PKGS}" ]]; then
-      # Re-merge cros-workon packages, this time from source. This is
-      # inefficient, but regular emerge doesn't support any way of specifying
-      # that you want specific packages to be merged from source only.
-      eretry ${EMERGE_BOARD_CMD} --oneshot ${CROS_WORKON_PKGS}
-    fi
-  else
-    # Re-merge cros_workon packages, updating dependencies if necessary.
-    #   --selective=n: Always re-merge cros_workon packages.
-    #   -1: Don't add cros_workon packages to world file.
-    if [[ -n "${CROS_WORKON_PKGS}" ]]; then
-      eretry ${EMERGE_BOARD_CMD} -uDNv1 --selective=n ${CROS_WORKON_PKGS}
-    fi
-
-    # Update the remainder of the packages.
-    eretry ${EMERGE_BOARD_CMD} -uDNv ${EMERGE_FLAGS} ${PACKAGES}
-  fi
+for pkg in ${CROS_WORKON_PKGS}; do
+  EMERGE_FLAGS+=" --reinstall-atoms=${pkg}"
+  EMERGE_FLAGS+=" --usepkg-exclude=${pkg}"
+done
+if [[ "${FLAGS_norebuild}" -eq "${FLAGS_FALSE}" ]]; then
+  EMERGE_FLAGS+=" --rebuild-if-unbuilt"
 fi
-
+if [[ "${FLAGS_oldchromebinary}" -eq "${FLAGS_TRUE}" ]]; then
+  EMERGE_FLAGS+=" --useoldpkg-atoms=chromeos-chrome"
+  EMERGE_FLAGS+=" --useoldpkg-atoms=libcros"
+fi
+if [[ "${FLAGS_showoutput}" -eq "${FLAGS_TRUE}" && \
+      "${FLAGS_fast}" -eq "${FLAGS_TRUE}" ]]; then
+  # Only parallel_emerge supports --show-output.
+  EMERGE_FLAGS+=" --show-output"
+fi
+eretry sudo -E ${EMERGE_BOARD_CMD} -uDNv ${EMERGE_FLAGS} ${PACKAGES}
 
 echo "Builds complete"
 print_time_elapsed