=== modified file 'functions/fsb_infer_gentoo_settings'
--- functions/fsb_infer_gentoo_settings	2013-05-22 18:26:40 +0000
+++ functions/fsb_infer_gentoo_settings	2013-05-15 07:03:51 +0000
@@ -1,11 +1,11 @@
 # globals
 typeset -g \
 	STAGE_GENTOO_ARCH \
-	STAGE_GENTOO_MACHINE \
 	STAGE_GENTOO_NAME \
 	STAGE_GENTOO_BRANCH \
 	STAGE_PORTAGE_TS \
-	STAGE_OVERLAY_REVNO
+	STAGE_OVERLAY_REVNO \
+	STAGE_GENTOO_MIXINS
 
 [[ -n $STAGE_GENTOO_NAME ]] || die 'STAGE_GENTOO_NAME needs to be set'
 if [[ -z $STAGE_GENTOO_ARCH ]]; then
@@ -20,6 +20,7 @@
 fi
 
 if [[ -z $STAGE_GENTOO_MACHINE ]]; then
+	typeset -g STAGE_GENTOO_MACHINE
 	case $STAGE_GENTOO_NAME in
 		(latest-stage3-i486*)
 			STAGE_GENTOO_MACHINE=i486;;
@@ -39,3 +40,23 @@
 : ${STAGE_OVERLAY_REVNO:=$(bzr revno $FSB_OVERLAY_SRC)} || \
 	die "could not determine the revision of $FSB_OVERLAY_SRC"
 
+: ${STAGE_GENTOO_MIXINS:=base nokit}
+: ${STAGE_GENTOO_DEV:=udev}
+
+STAGE_GENTOO_DIR_BASE=$FSB_BUILD_DIR/gentoo
+STAGE_GENTOO_DIR_BASE+=-$STAGE_GENTOO_ARCH
+STAGE_GENTOO_DIR_BASE+=-$STAGE_GENTOO_MACHINE
+STAGE_GENTOO_DIR_BASE+=-$STAGE_GENTOO_BRANCH
+STAGE_GENTOO_DIR_BASE+=-p$STAGE_PORTAGE_TS
+STAGE_GENTOO_DIR_BASE+=-o$STAGE_OVERLAY_REVNO
+STAGE_GENTOO_DIR_BASE+=-${STAGE_GENTOO_DEV//-}
+(($+STAGE_GENTOO_PORTAGE22)) && \
+	STAGE_GENTOO_DIR_BASE+=-port22
+(($+STAGE_GENTOO_NOPY3K)) && \
+	STAGE_GENTOO_DIR_BASE+=-nopy3k
+if [[ -n $STAGE_GENTOO_MIXINS ]]; then
+	local m
+	for m in $=STAGE_GENTOO_MIXINS; do
+		STAGE_GENTOO_DIR_BASE+=-$m
+	done
+fi

=== modified file 'functions/fsb_target_gentoo_base'
--- functions/fsb_target_gentoo_base	2013-05-22 18:26:40 +0000
+++ functions/fsb_target_gentoo_base	2013-05-22 17:11:58 +0000
@@ -2,7 +2,6 @@
 	FSB_INFO_DEPEND=gentoo_init
 	FSB_INFO_BASE=%s
 	(($+STAGE_GENTOO_PORTAGE22)) && FSB_INFO_BASE+=-port22
-	: ${STAGE_GENTOO_MIXINS:=base nokit}
 	local mixin
 	for mixin in $=STAGE_GENTOO_MIXINS; do
 		FSB_INFO_BASE+=-$mixin

=== modified file 'functions/fsb_target_gentoo_dev'
--- functions/fsb_target_gentoo_dev	2013-05-22 18:26:40 +0000
+++ functions/fsb_target_gentoo_dev	2013-05-22 18:11:27 +0000
@@ -1,6 +1,5 @@
 if [[ $1 == info ]]; then
 	FSB_INFO_DEPEND=gentoo_python
-	: ${STAGE_GENTOO_DEV:=udev}
 	case $STAGE_GENTOO_DEV in
 		(static-dev) FSB_INFO_BASE=%s-static-dev;;
 		(mdev) FSB_INFO_BASE=%s-mdev;;

=== modified file 'functions/fsb_target_gentoo_init'
--- functions/fsb_target_gentoo_init	2013-05-22 18:26:40 +0000
+++ functions/fsb_target_gentoo_init	2013-05-22 16:25:36 +0000
@@ -3,8 +3,7 @@
 
 	FSB_INFO_BASE=$FSB_BUILD_DIR/gentoo
 	FSB_INFO_BASE+=-$STAGE_GENTOO_ARCH
-	[[ $STAGE_GENTOO_ARCH != $STAGE_GENTOO_MACHINE ]] && \
-		FSB_INFO_BASE+=-$STAGE_GENTOO_MACHINE
+	FSB_INFO_BASE+=-$STAGE_GENTOO_MACHINE
 	FSB_INFO_BASE+=-$STAGE_GENTOO_BRANCH
 	FSB_INFO_BASE+=-p$STAGE_PORTAGE_TS
 	FSB_INFO_BASE+=-o$STAGE_OVERLAY_REVNO