[gentoo-commits] proj/crossdev:master commit in: /

[Mike Frysinger]

commit:     1ed7a8be200dbe4575cc029212f2ee18d0bd5d74
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 00:20:12 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 00:20:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=1ed7a8be

crossdev: look up default crossdev overlays with `portageq get_repo_path`

This lets people name the overlays explicitly and crossdev will pick that
up by name.

URL: https://bugs.gentoo.org/486422
Reported-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 crossdev | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/crossdev b/crossdev
index 8290c12..b5ba7b3 100755
--- a/crossdev
+++ b/crossdev
@@ -311,9 +311,20 @@ setup_portage_vars() {
 	: ${SEARCH_OVERLAYS:=${PORTDIR_OVERLAY}}
 
 	# see if user told us where to write things, otherwise
-	# install our stuff to the first overlay in the list
-	: ${CROSSDEV_OVERLAY:=${SEARCH_OVERLAYS}}
-	CROSSDEV_OVERLAY=${CROSSDEV_OVERLAY%% *}
+	# set up some repos.conf magic if possible.  if not,
+	# install our stuff to the first overlay in the list.
+	if [[ -z ${CROSSDEV_OVERLAY} ]] ; then
+		CROSSDEV_OVERLAY=${SEARCH_OVERLAYS%% *}
+
+		local repo
+		for repo in "cross-${CTARGET}" crossdev ; do
+			repo=$(portageq get_repo_path / "${repo}")
+			if [[ -n ${repo} ]] ; then
+				CROSSDEV_OVERLAY=${repo}
+				break
+			fi
+		done
+	fi
 
 	# make sure we have a valid logdir
 	: ${PORT_LOGDIR:=/var/log/portage}