=== removed file 'functions/fsb_chroot_bash'
--- functions/fsb_chroot_bash	2013-05-14 18:51:14 +0000
+++ functions/fsb_chroot_bash	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-$build_dir/chroot.sh /bin/bash --login -c "${(j: :)${(q)@}}" || die "command failed: ${(j: :)${(q)@}}"

=== removed file 'functions/fsb_gentoo_profile_add'
--- functions/fsb_gentoo_profile_add	2013-05-14 18:51:14 +0000
+++ functions/fsb_gentoo_profile_add	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-local dir=$1
-shift
-for profile in "$@"; do
-	[[ $profile != /* ]] && \
-		profile=/var/portage/prosys/overlay/profiles/$profile
-	print -r - $profile >>$dir/var/portage/local/profiles/custom/parent || die
-done

=== modified file 'functions/fsb_infer_gentoo_settings'
--- functions/fsb_infer_gentoo_settings	2013-05-14 18:51:14 +0000
+++ functions/fsb_infer_gentoo_settings	2013-05-14 16:35:20 +0000
@@ -31,19 +31,3 @@
 : ${STAGE_PORTAGE_TS:=${$(</usr/portage/metadata/timestamp.x)[1]}}
 : ${STAGE_OVERLAY_REVNO:=$(bzr revno $FSB_OVERLAY_SRC)} || \
 	die "could not determine the revision of $FSB_OVERLAY_SRC"
-
-case $STAGE_GENTOO_BRANCH in
-	(stable)
-		accept_keywords=$STAGE_GENTOO_ARCH;;
-	(testing)
-		accept_keywords="~$STAGE_GENTOO_ARCH";;
-	(*)
-		die "STAGE_GENTOO_BRANCH can be either stable or testing, not $STAGE_GENTOO_ARCH";;
-esac
-
-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

=== removed file 'functions/fsb_target_gentoo_base'
--- functions/fsb_target_gentoo_base	2013-05-14 18:51:14 +0000
+++ functions/fsb_target_gentoo_base	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-local dir
-
-fsb_infer_gentoo_settings
-
-dir=$STAGE_GENTOO_DIR_BASE
-dir+=-base
-
-build_dir_check $dir $0 && return 0
-[[ $? -eq 100 ]] || die "build_dir_check failed"
-
-build_dir_push $dir
-build_target gentoo_init
-
-fsb_gentoo_profile_add mixin/nokit mixin/portage22
-fsb_chroot_bash emerge -u portage || die

=== modified file 'functions/fsb_target_gentoo_init'
--- functions/fsb_target_gentoo_init	2013-05-14 18:51:14 +0000
+++ functions/fsb_target_gentoo_init	2013-05-14 18:13:57 +0000
@@ -2,8 +2,22 @@
 
 fsb_infer_gentoo_settings
 
-dir=$STAGE_GENTOO_DIR_BASE
-dir+=-conf
+case $STAGE_GENTOO_BRANCH in
+	(stable)
+		accept_keywords=$STAGE_GENTOO_ARCH;;
+	(testing)
+		accept_keywords="~$STAGE_GENTOO_ARCH";;
+	(*)
+		die "STAGE_GENTOO_BRANCH can be either stable or testing, not $STAGE_GENTOO_ARCH";;
+esac
+
+dir=$FSB_BUILD_DIR/gentoo
+dir+=-$STAGE_GENTOO_ARCH
+dir+=-$STAGE_GENTOO_MACHINE
+dir+=-$STAGE_GENTOO_BRANCH
+dir+=-p$STAGE_PORTAGE_TS
+dir+=-o$STAGE_OVERLAY_REVNO
+dir+=-stage0
 
 build_dir_check $dir $0 && return 0
 [[ $? -eq 100 ]] || die "build_dir_check failed"
@@ -28,8 +42,6 @@
 cat >>$dir/etc/portage/make.conf <<EOF
 ACCEPT_KEYWORDS="${accept_keywords}"
 
-EMERGE_DEFAULT_OPTS="--verbose --quiet-build=y --keep-going"
-
 PORTDIR_OVERLAY="/var/portage/prosys/overlay /var/portage/local"
 PKGDIR="/var/portage/packages"
 DISTDIR="/var/portage/distfiles"
@@ -49,4 +61,5 @@
 
 profile=/usr/portage/${profile_link#*/portage/}
 ln -s ../../var/portage/local/profiles/custom $dir/etc/portage/make.profile || die
-fsb_gentoo_profile_add $profile arch/$STAGE_GENTOO_MACHINE
+echo $profile >$dir/etc/portage/make.profile/parent || die
+echo /var/portage/prosys/overlay/profiles/arch/$STAGE_GENTOO_MACHINE >>$dir/etc/portage/make.profile/parent || die

=== removed file 'functions/fsb_target_gentoo_py2'
--- functions/fsb_target_gentoo_py2	2013-05-14 18:51:14 +0000
+++ functions/fsb_target_gentoo_py2	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-local dir
-
-fsb_infer_gentoo_settings
-
-dir=$STAGE_GENTOO_DIR_BASE
-dir+=-py2
-
-build_dir_check $dir $0 && return 0
-[[ $? -eq 100 ]] || die "build_dir_check failed"
-
-build_dir_push $dir
-build_target gentoo_init
-
-fsb_gentoo_profile_add mixin/nokit mixin/portage22
-fsb_chroot_bash emerge -1u '=python-2.7*' python-updater portage
-fsb_chroot_bash eselect python set python2.7
-fsb_chroot_bash emerge --unmerge '>=dev-lang/python-3'
-fsb_chroot_bash python-updater

=== removed file 'functions/fsb_target_gentoo_system'
--- functions/fsb_target_gentoo_system	2013-05-14 18:51:14 +0000
+++ functions/fsb_target_gentoo_system	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-local dir
-
-fsb_infer_gentoo_settings
-
-dir=$STAGE_GENTOO_DIR_BASE
-dir+=-system
-
-build_dir_check $dir $0 && return 0
-[[ $? -eq 100 ]] || die "build_dir_check failed"
-
-build_dir_push $dir
-build_target gentoo_py2
-
-fsb_gentoo_profile_add mixin/nokit mixin/portage22
-fsb_chroot_bash emerge -uDN @world
-fsb_chroot_bash emerge --depclean