cros_workon: use portageq instead of sourcing make.conf

cros_workon

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script moves ebuilds between 'stable' and 'live' states.
 # By default 'stable' ebuilds point at and build from source at the
 # last known good commit. Moving an ebuild to 'live' (via cros_workon start)
 # is intended to support development. The current source tip is fetched,
@@ skipping 40 matching lines @@
 [ -n "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_TRUE} ] && \
   FLAGS_board="" # kill board
 [ -z "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_FALSE} ] && \
 [ "${WORKON_CMD}" != "list-all" ] && \
   die "You must specify either --host or --board="
 
 if [ -n "${FLAGS_board}" ]; then
   BOARD_DIR=/build/"${FLAGS_board}" # --board specified
   EQUERYCMD=equery-"${FLAGS_board}"
   EBUILDCMD=ebuild-"${FLAGS_board}"
+  PORTAGEQCMD=portageq-"${FLAGS_board}"
   BOARD_STR="${FLAGS_board}"
   BOARD_KEYWORD="$(portageq-${FLAGS_board} envvar ARCH)"
 else
   BOARD_DIR="" # --host specified
   EQUERYCMD=equery
   EBUILDCMD=ebuild
+  PORTAGEQCMD=portageq
   BOARD_STR="host"
   BOARD_KEYWORD="$(portageq envvar ARCH)"
 fi
 
 WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon
 KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords
 UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask
 WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host}
 KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon
 UNMASK_FILE=${UNMASK_DIR}/cros-workon
@@ skipping 14 matching lines @@
 fi
 if [ ! -L "${UNMASK_FILE}" ]; then
   [ -f "${UNMASK_FILE}" ] && sudo mv "${UNMASK_FILE}" "${WORKON_FILE}"
   sudo ln -s "${WORKON_FILE}" "${UNMASK_FILE}" || \
     die "ln -s ${WORKON_FILE} ${UNMASK_FILE}"
 fi
 
 find_keyword_workon_ebuilds() {
   keyword="${1}"
 
-  pushd "${BOARD_DIR}"/etc/ 1> /dev/null
-  source make.conf
-  popd 1> /dev/null
-  local CROS_OVERLAYS="${PORTDIR_OVERLAY}"
+  local cros_overlays=$("${PORTAGEQCMD}" envvar PORTDIR_OVERLAY)
 
   # NOTE: overlay may be a symlink, and we have to use ${overlay}/
-  for overlay in ${CROS_OVERLAYS}; do
+  for overlay in ${cros_overlays}; do
     # only look up ebuilds named 9999 to eliminate duplicates
     find ${overlay}/ -name '*9999.ebuild' | \
       xargs grep -l "inherit.*cros-workon" | \
       xargs grep -l "KEYWORDS=.*${keyword}.*"
   done
 }
 
 show_workon_ebuilds() {
   keyword=$1
 
@@ skipping 149 matching lines @@
 fi
 
 case ${WORKON_CMD} in
   start)  ebuild_to_live "${ATOM_LIST}" ;;
   stop)   ebuild_to_stable "${ATOM_LIST}" ;;
   list)   [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || show_workon_ebuilds ${BOARD_KEYWORD} ;;
   list-all) show_all_live_ebuilds ;;
   iterate)ebuild_iterate "${ATOM_LIST}" ;;
   *)      die "$(basename $0): command '${WORKON_CMD}' not recognized" ;;
 esac