=== modified file 'bin/fsb'
--- bin/fsb	2015-04-22 09:27:14 +0000
+++ bin/fsb	2013-09-12 13:38:27 +0000
@@ -1,7 +1,5 @@
 #!/bin/zsh
 
-setopt no_unset warn_create_global extendedglob
-
 PS4='+%B%* %F{cyan}%N%f:%F{yellow}%i%f>%b '
 
 zparseopts -D \
@@ -39,7 +37,6 @@
 
 for option_flag option_value in $ARGS_C; do
 	source $option_value || exit 1
-	: ${FSB_TARGET_NAME:=${option_value:t}}
 done
 
 (($#@)) && FSB_TARGET=$1
@@ -54,7 +51,7 @@
 : ${FSB_SCRIPTS_DIR:=$FSB_BASE_DIR/scripts}
 : ${FSB_TEMPLATE_DIR:=$FSB_BASE_DIR/template}
 : ${FSB_GENTOO_MIRROR:=ftp://ftp.fi.muni.cz/pub/linux/gentoo/}
-: ${FSB_OVERLAY_BASE:=/home/ccx/bzr}
+: ${FSB_OVERLAY_SRC:=/home/ccx/bzr/prosys}
 : ${FSB_PORTAGE_SNAPSHOTS:=/mnt/data/snapshots/portage}
 
 # basic initialisation
@@ -140,37 +137,34 @@
 	info_vars=(
 		FSB_INFO_BASE # base build directory name passed up to calling stage
 		FSB_INFO_DIR # directory for building this stage
-		# FSB_INFO_KEEP # whether to keep build directory around
+		FSB_INFO_KEEP # whether to keep build directory around
 		FSB_INFO_SKIP # skip calling build stage of this script
-		FSB_INFO_RESUME # if this stage can be resumed
 		FSB_INFO_DEPEND # build this stage first and then clone it's directory
 	)
 	typeset -g $info_vars
 	FSB_INFO_DEPEND='' # sanitize
-	FSB_INFO_DIR='%s'
-	FSB_INFO_SKIP=0
-	FSB_INFO_RESUME=0
 
-	(($+fsb_targets[$1])) || die "no such target: ${(q)1}"
+	[[ -n $fsb_targets[$1] ]] || die "no such target: ${(q)fsb_targets[$1]}"
 	$fsb_targets[$1] info || die "$1 info failed"
 
-	local param info_name
-	info_name=TARGET_INFO_${1#fsb_target_}
+	local param info_name=TARGET_INFO_${1#fsb_target_}
 	local -A info
 	for param in $info_vars; do
-		# [[ -n ${(P)param} ]] && \
-		typeset "info[${param#FSB_INFO_}]"=${(P)param}
+		[[ -n ${(P)param} ]] && \
+			typeset "info[${param#FSB_INFO_}]"=${(P)param}
 		unset $param
 	done
 	info[FUNC]=$1
 
-	if (($info[SKIP])); then
+	if ((${info[SKIP]:-0})); then
 		target_info $info[DEPEND]
 		return
 	fi
 
 	build_stack+=$info_name
 
+	: ${info[DIR]:=%s}
+
 	if [[ $info[BASE] == *'%s'* ]]; then
 		[[ -n $info[DEPEND] ]] || die "target $1 does use %s in BASE and does not depend on another target"
 		target_info $info[DEPEND]
@@ -194,7 +188,7 @@
 	fi
 	local k v
 	typeset -gA ${info_name}
-	for k v in "${(kv@)info}"; do
+	for k v in ${(kv)info}; do
 		typeset -g "${info_name}[${k}]"=$v
 	done
 }
@@ -202,7 +196,7 @@
 target_stack_build() {
 	local -A info
 	local k v mark
-	for k v in "${(kvP@)build_stack[${1:-1}]}"; do
+	for k v in ${(kvP)build_stack[${1:-1}]}; do
 		typeset "info[$k]"=$v
 	done
 
@@ -275,17 +269,3 @@
 mkdir -p $FSB_BUILD_DIR
 build_target ${1:-$FSB_TARGET}
 fsb_info "build completed into: $build_dir"
-if [[ -d $build_dir:h:h/done/$build_dir:t ]]; then
-	btrfs sub del $build_dir:h:h/done/$build_dir:t || \
-		die "could not remove done snapshot"
-fi
-btrfs sub snap $build_dir $build_dir:h:h/done/$build_dir:t
-if (($+FSB_TARGET_NAME)); then
-	local done_link
-	done_link=$build_dir:h:h/done/$FSB_TARGET_NAME
-	if [[ -e $done_link ]]; then
-		rm $done_link || die "could create done-link ${(q)done_link}: already present"
-	fi
-	ln -s $build_dir:t $done_link
-	fsb_info "target available in: $done_link"
-fi

=== removed file 'configs/alpine-amd64-edge'
--- configs/alpine-amd64-edge	2014-10-29 14:11:53 +0000
+++ configs/alpine-amd64-edge	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-STAGE_ALPINE_ARCH=x86_64
-STAGE_ALPINE_RELEASE=edge
-

=== removed file 'configs/alpine-x86-edge'
--- configs/alpine-x86-edge	2014-10-29 14:11:53 +0000
+++ configs/alpine-x86-edge	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-STAGE_ALPINE_ARCH=x86
-STAGE_ALPINE_RELEASE=edge
-

=== modified file 'configs/amd64_desktop'
--- configs/amd64_desktop	2015-04-22 09:24:39 +0000
+++ configs/amd64_desktop	2013-09-12 09:53:44 +0000
@@ -1,3 +1,2 @@
 source $0:h/desktop
 STAGE_GENTOO_NAME=latest-stage3-amd64
-STAGE_GENTOO_PROFILE=default/linux/amd64/13.0

=== modified file 'configs/amd64_hardened_server'
--- configs/amd64_hardened_server	2014-10-29 14:11:53 +0000
+++ configs/amd64_hardened_server	2013-06-04 19:44:44 +0000
@@ -1,10 +1,8 @@
-# vim: ft=zsh noet
 STAGE_GENTOO_NAME=latest-stage3-amd64-hardened+nomultilib
-STAGE_GENTOO_PROFILE=hardened/linux/amd64/no-multilib
-#STAGE_GENTOO_BRANCH=testing
+STAGE_GENTOO_BRANCH=testing
 STAGE_GENTOO_DEV=mdev
-#STAGE_GENTOO_PORTAGE22=1
+STAGE_GENTOO_PORTAGE22=1
 STAGE_GENTOO_NOPY3K=1
-#STAGE_GENTOO_MIXINS="base nokit nodbus nox"
+STAGE_GENTOO_MIXINS="base nokit nodbus"
 STAGE_GENTOO_FLAVOR=server
 FSB_TARGET=gentoo_flavor

=== modified file 'configs/amd64_hardened_vserver'
--- configs/amd64_hardened_vserver	2014-10-29 14:11:53 +0000
+++ configs/amd64_hardened_vserver	2013-05-17 17:57:22 +0000
@@ -1,3 +1,2 @@
 source $0:h/vserver
 STAGE_GENTOO_NAME=latest-stage3-amd64-hardened+nomultilib
-STAGE_GENTOO_PROFILE=hardened/linux/amd64/no-multilib

=== removed file 'configs/amd64_hardened_vserver_c3master'
--- configs/amd64_hardened_vserver_c3master	2014-10-29 14:11:53 +0000
+++ configs/amd64_hardened_vserver_c3master	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-source $0:h/amd64_hardened_vserver
-STAGE_GENTOO_FLAVOR=vserver-c3-master

=== removed file 'configs/amd64_hardened_vshost'
--- configs/amd64_hardened_vshost	2015-04-22 09:24:39 +0000
+++ configs/amd64_hardened_vshost	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-source $0:h/amd64_hardened_server
-STAGE_GENTOO_FLAVOR=vshost
-FSB_TARGET=gentoo_bootloader

=== removed file 'configs/amd64_server'
--- configs/amd64_server	2014-10-29 14:11:53 +0000
+++ configs/amd64_server	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-# vim: ft=zsh noet
-STAGE_GENTOO_NAME=latest-stage3-amd64
-STAGE_GENTOO_PROFILE=default/linux/amd64/13.0
-STAGE_GENTOO_BRANCH=testing
-STAGE_GENTOO_DEV=mdev
-STAGE_GENTOO_NOPY3K=1
-STAGE_GENTOO_FLAVOR=server
-FSB_TARGET=gentoo_flavor
-

=== modified file 'configs/base'
--- configs/base	2014-10-29 14:11:53 +0000
+++ configs/base	2013-09-12 09:53:44 +0000
@@ -1,9 +1,8 @@
-# vim: ft=zsh noet
 STAGE_GENTOO_BRANCH=testing
 STAGE_GENTOO_DEV=mdev
 STAGE_GENTOO_PORTAGE22=1
 STAGE_GENTOO_NOPY3K=1
-STAGE_GENTOO_MIXINS="base nokit nodbus"
-#STAGE_GENTOO_GCC=4.8.2
+STAGE_GENTOO_MIXINS="base nokit nodbus gcc48"
+STAGE_GENTOO_GCC=4.8.1
 STAGE_GENTOO_EMPTYTREE=1
 STAGE_GENTOO_FLAVOR=desktop

=== modified file 'configs/desktop'
--- configs/desktop	2015-04-22 09:24:39 +0000
+++ configs/desktop	2013-09-12 09:53:44 +0000
@@ -2,7 +2,7 @@
 STAGE_GENTOO_DEV=mdev
 STAGE_GENTOO_PORTAGE22=1
 STAGE_GENTOO_NOPY3K=1
-STAGE_GENTOO_MIXINS="base nokit nodbus"
-#STAGE_GENTOO_GCC=4.8.1-r1
+STAGE_GENTOO_MIXINS="base nokit nodbus gcc48"
+STAGE_GENTOO_GCC=4.8.1
 STAGE_GENTOO_EMPTYTREE=1
 STAGE_GENTOO_FLAVOR=desktop

=== removed file 'configs/pentium4_desktop'
--- configs/pentium4_desktop	2014-10-29 14:11:53 +0000
+++ configs/pentium4_desktop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-source $0:h/desktop
-STAGE_GENTOO_NAME=latest-stage3-i686
-STAGE_GENTOO_MACHINE=pentium4

=== modified file 'configs/vserver'
--- configs/vserver	2015-04-22 09:24:39 +0000
+++ configs/vserver	2013-05-29 11:02:46 +0000
@@ -1,5 +1,6 @@
 STAGE_GENTOO_BRANCH=testing
 STAGE_GENTOO_DEV=minimal-dev
+STAGE_GENTOO_PORTAGE22=1
 STAGE_GENTOO_NOPY3K=1
+STAGE_GENTOO_MIXINS="base nokit nodbus"
 STAGE_GENTOO_FLAVOR=vserver
-FSB_TARGET=gentoo_flavor

=== modified file 'fsbrc'
--- fsbrc	2014-10-29 14:11:53 +0000
+++ fsbrc	2013-09-12 09:53:44 +0000
@@ -1,8 +1,4 @@
 # vim: ft=zsh
 export EMERGE_DEFAULT_OPTS="--jobs 6"
 export MAKEOPTS="-l7 -j7"
-MAKEOPTS="-j1"
 EATMYDATA=1
-VAR_TMP_TMPFS=1
-TMPFS_SIZE=16G
-FSB_ALPINE_MIRROR=http://dl-3.alpinelinux.org/alpine/

=== modified file 'functions/fsb_download_gentoo_autobuild_stage'
--- functions/fsb_download_gentoo_autobuild_stage	2015-04-22 09:24:39 +0000
+++ functions/fsb_download_gentoo_autobuild_stage	2013-05-13 22:55:00 +0000
@@ -1,7 +1,7 @@
 # $1 should be .txt file in autobuild directory, eg.:
 # ftp://.../gentoo/releases/amd64/autobuilds/latest-stage3-amd64.txt
 local relative prefix
-relative=$(wget -qO - $1 | grep -o '^[^# ]\+')
+relative=$(wget -qO - $1 | grep -v '^#')
 (( $pipestatus[1] )) && die "could not fetch $1"
 [[ -z "$relative" ]] && die "no filename found in $1"
 prefix=$1:h

=== removed file 'functions/fsb_gentoo_overlay_add'
--- functions/fsb_gentoo_overlay_add	2014-10-29 14:11:53 +0000
+++ functions/fsb_gentoo_overlay_add	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-bzr branch -r $STAGE_OVERLAY_REVNO[$1] $FSB_OVERLAY_BASE/$1 $build_dir/var/portage/$1 || die "Failed to branch overlay ${(qqq)1}"
-sed -i "s|PORTDIR_OVERLAY=[\"']|&/var/portage/$1 |" $build_dir/etc/portage/make.conf || die

=== modified file 'functions/fsb_gentoo_profile_add'
--- functions/fsb_gentoo_profile_add	2014-10-29 14:11:53 +0000
+++ functions/fsb_gentoo_profile_add	2013-05-17 17:48:01 +0000
@@ -1,19 +1,6 @@
-local overlay profile
-if [[ $1 == -o ]]; then
-	overlay=$2
-	shift 2
-else
-	overlay=ccx-packages
-fi
-
-[[ -d $build_dir/var/portage/$overlay ]] || die "overlay dir ${(qqq)overlay} not found"
-
 for profile in "$@"; do
 	[[ $profile != /* ]] && \
-		profile=/var/portage/$overlay/profiles/$profile
+		profile=/var/portage/prosys/overlay/profiles/$profile
 	print -r - $profile >>$build_dir/var/portage/local/profiles/custom/parent || die
 done
-
-if [[ -x $build_dir/var/portage/$overlay/scripts/update_profiles ]]; then
-	fsb_chroot_bash /var/portage/$overlay/scripts/update_profiles || die update_profiles
-fi
+fsb_chroot_bash /var/portage/prosys/overlay/scripts/update_profiles

=== modified file 'functions/fsb_gentoo_set_gcc'
--- functions/fsb_gentoo_set_gcc	2014-10-29 14:11:53 +0000
+++ functions/fsb_gentoo_set_gcc	2013-05-29 10:46:20 +0000
@@ -1,6 +1,4 @@
-local version
-version=${1:-[.0-9]*}
 $build_dir/chroot.sh /bin/bash -l -c '
 eval "$(emerge --info | grep "^CHOST=")"
-gcc-config $(gcc-config -l | gawk "\$2 ~ /$CHOST-'$version'$/{print \$2}" | sort -r | head -1)
+gcc-config $(gcc-config -l | gawk "\$2 ~ /$CHOST-[.0-9]*'$1'$/{print \$2}" | sort -r | head -1)
 '

=== modified file 'functions/fsb_infer_gentoo_settings'
--- functions/fsb_infer_gentoo_settings	2014-10-29 14:11:53 +0000
+++ functions/fsb_infer_gentoo_settings	2013-05-22 18:26:40 +0000
@@ -4,8 +4,8 @@
 	STAGE_GENTOO_MACHINE \
 	STAGE_GENTOO_NAME \
 	STAGE_GENTOO_BRANCH \
-	STAGE_PORTAGE_TS
-typeset -g -A STAGE_OVERLAY_REVNO
+	STAGE_PORTAGE_TS \
+	STAGE_OVERLAY_REVNO
 
 [[ -n $STAGE_GENTOO_NAME ]] || die 'STAGE_GENTOO_NAME needs to be set'
 if [[ -z $STAGE_GENTOO_ARCH ]]; then
@@ -36,11 +36,6 @@
 
 : ${STAGE_GENTOO_BRANCH:=stable}
 : ${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"
 
-local overlay
-for overlay in ccx-{bootstrap,packages,pypi}; do
-	if ! (($+STAGE_OVERLAY_REVNO[$overlay])); then
-		STAGE_OVERLAY_REVNO[$overlay]=$(bzr revno $FSB_OVERLAY_BASE/$overlay) || \
-		die "could not determine the revision of $FSB_OVERLAY_BASE/$overlay"
-	fi
-done

=== removed file 'functions/fsb_target_alpine_base'
--- functions/fsb_target_alpine_base	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_alpine_base	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# vim: ft=zsh
-if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=alpine_init
-	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s-base
-	return
-elif [[ $1 != build ]]; then
-	die "unimplemented action: $*"
-fi
-
-mkdir -p $build_dir/dev || die "could not create /dev"
-mknod -m 666 ${build_dir}/dev/full c 1 7 || die "error populating /dev"
-mknod -m 666 ${build_dir}/dev/ptmx c 5 2 || die "error populating /dev"
-mknod -m 644 ${build_dir}/dev/random c 1 8 || die "error populating /dev"
-mknod -m 644 ${build_dir}/dev/urandom c 1 9 || die "error populating /dev"
-mknod -m 666 ${build_dir}/dev/zero c 1 5 || die "error populating /dev"
-mknod -m 666 ${build_dir}/dev/tty c 5 0 || die "error populating /dev"
-cp /etc/resolv.conf $build_dir/etc/ || die "could not copy resolv.conf"
-mkdir -p $build_dir/root || die "could not create /root"
-cp $FSB_TEMPLATE_DIR/chroot.sh $build_dir/ || die "could not copy chroot.sh"

=== removed file 'functions/fsb_target_alpine_init'
--- functions/fsb_target_alpine_init	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_alpine_init	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# vim: ft=zsh
-if [[ $1 == info ]]; then
-	STAGE_ALPINE_DOWN_DIR=$FSB_DOWNLOADS_DIR/alpine/
-	STAGE_ALPINE_DOWN_DIR+=$STAGE_ALPINE_RELEASE/main/
-	STAGE_ALPINE_DOWN_DIR+=$STAGE_ALPINE_ARCH
-
-	mkdir -p $STAGE_ALPINE_DOWN_DIR || die "could not make download directory"
-	(
-		cd $STAGE_ALPINE_DOWN_DIR && \
-		wget -S -N -v $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/main/$STAGE_ALPINE_ARCH/APKINDEX.tar.gz && \
-		tar xf APKINDEX.tar.gz DESCRIPTION
-	) || die "downloading APKINDEX failed"
-	STAGE_APKINDEX_VERSION=$(<$STAGE_ALPINE_DOWN_DIR/DESCRIPTION)
-
-	FSB_INFO_BASE=$FSB_BUILD_DIR/alpine
-	FSB_INFO_BASE+=-$STAGE_ALPINE_ARCH
-	FSB_INFO_BASE+=-$STAGE_ALPINE_RELEASE
-	FSB_INFO_BASE+=-$STAGE_APKINDEX_VERSION
-	FSB_INFO_DIR=%s-init
-
-	return
-elif [[ $1 != build ]]; then
-	die "unimplemented action: $*"
-fi
-
-local -a apk_args
-apk_args=(
-	#--repository file://${STAGE_ALPINE_DOWN_DIR:h:a}
-	--repository $FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/main
-	--update-cache
-	--root $build_dir
-	--arch $STAGE_ALPINE_ARCH
-	--keys-dir /etc/apk/keys/
-	--initdb
-	add alpine-base
-)
-apk.static $apk_args || die "alpine init failed"
-mkdir -p $build_dir/etc/apk || die "failed to set up apk"
-print -r - "$FSB_ALPINE_MIRROR/$STAGE_ALPINE_RELEASE/main" > ${build_dir}/etc/apk/repositories || die "failed to set up apk"

=== modified file 'functions/fsb_target_gentoo_autobuild_stage'
--- functions/fsb_target_gentoo_autobuild_stage	2015-04-22 09:24:39 +0000
+++ functions/fsb_target_gentoo_autobuild_stage	2013-05-22 16:33:46 +0000
@@ -1,12 +1,11 @@
-# vim: ft=zsh noet
 if [[ $1 == info ]]; then
 	fsb_infer_gentoo_settings
 
-	if ! (($+STAGE_GENTOO_TARBALL_URL)); then
+	if [[ -z $STAGE_GENTOO_TARBALL_URL ]]; then
 		typeset -g STAGE_GENTOO_TARBALL_URL
 		local txt relative prefix
 		txt=$FSB_GENTOO_MIRROR/releases/$STAGE_GENTOO_ARCH/autobuilds/$STAGE_GENTOO_NAME.txt
-		relative=$(wget -qO - $txt | grep -o '^[^# ]\+')
+		relative=$(wget -qO - $txt | grep -v '^#')
 		(( $pipestatus[1] )) && die "could not fetch $txt"
 		[[ -z "$relative" ]] && die "no filename found in $txt"
 		prefix=$txt:h

=== renamed file 'functions/fsb_target_gentoo_mixins' => 'functions/fsb_target_gentoo_base'
--- functions/fsb_target_gentoo_mixins	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_gentoo_base	2013-09-12 09:53:44 +0000
@@ -1,9 +1,8 @@
 # vim: ft=zsh
 if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_gcc
+	FSB_INFO_DEPEND=gentoo_init
 	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s-mixins
-	# (($+STAGE_GENTOO_PORTAGE22)) && FSB_INFO_BASE+=-port22
+	(($+STAGE_GENTOO_PORTAGE22)) && FSB_INFO_BASE+=-port22
 	: ${STAGE_GENTOO_MIXINS:=base nokit}
 	local mixin
 	for mixin in $=STAGE_GENTOO_MIXINS; do
@@ -14,8 +13,11 @@
 	die "unimplemented action: $*"
 fi
 
-fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/$^=STAGE_GENTOO_MIXINS
-# if (($+STAGE_GENTOO_PORTAGE22)); then
-# 	echo '<sys-apps/portage-9999 **' >>$build_dir/etc/portage/package.keywords
-# 	fsb_emerge -1 '>=sys-apps/portage-2.2.0_alpha1' || die
-# fi
+fsb_gentoo_profile_add mix-ins/$^=STAGE_GENTOO_MIXINS
+if (($+STAGE_GENTOO_PORTAGE22)); then
+	echo '<sys-apps/portage-9999 **' >>$build_dir/etc/portage/package.keywords
+	fsb_emerge -1 '>=sys-apps/portage-2.2.0_alpha1' || die
+fi
+if (($+EATMYDATA)); then
+	fsb_emerge -n libeatmydata
+fi

=== removed file 'functions/fsb_target_gentoo_bootloader'
--- functions/fsb_target_gentoo_bootloader	2015-04-22 09:24:39 +0000
+++ functions/fsb_target_gentoo_bootloader	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# vim: ft=zsh noet
-if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_genkernel
-	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s-boot
-	return
-elif [[ $1 != build ]]; then
-	die "unimplemented action: $*"
-fi
-mkdir -p $build_dir/boot/grub $build_dir/boot/grub2 || die mkdir -p
-cat >$build_dir/boot/grub2/grub.cfg <<EOF
-default=0
-timeout=10
-
-menuentry 'Gentoo - genkernel' {
-	linux	/boot/kernel dolvm domdadm
-	initrd	/boot/initramfs
-}
-
-menuentry 'Gentoo - genkernel (previous)' {
-	linux	/boot/kernel.old dolvm domdadm
-	initrd	/boot/initramfs.old
-}
-EOF
-ln -s ../grub2/grub.cfg $build_dir/boot/grub/grub.cfg || die ln -s
-cat >$build_dir/boot/extlinux.conf <<EOF
-UI menu.c32
-TIMEOUT 150
-DEFAULT genkernel.vga
-
-LABEL genkernel.vga
-KERNEL kernel
-APPEND initrd=initramfs dolvm domdadm vga=792
-
-LABEL genkernel
-KERNEL kernel
-APPEND initrd=initramfs dolvm domdadm
-
-LABEL genkernel.old
-KERNEL kernel.old
-APPEND initrd=initramfs.old dolvm domdadm
-EOF
-cp -v $build_dir/usr/share/extlinux/*.c32 $build_dir/boot/ || \
-	die "error copying extlinux/syslinux modules"
-[[ -h $build_dir/boot/boot ]] || ln -s . $build_dir/boot/boot || \
-	die "could not make recursive boot symlink"

=== modified file 'functions/fsb_target_gentoo_dev'
--- functions/fsb_target_gentoo_dev	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_gentoo_dev	2013-05-30 17:06:24 +0000
@@ -1,7 +1,4 @@
-# vim: ft=zsh noet
 if [[ $1 == info ]]; then
-	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s
 	FSB_INFO_DEPEND=gentoo_python
 	: ${STAGE_GENTOO_DEV:=udev}
 	case $STAGE_GENTOO_DEV in
@@ -18,17 +15,17 @@
 
 case $STAGE_GENTOO_DEV in
 	(static-dev)
-		fsb_gentoo_profile_add -o ccx-bootstrap packages/static-dev
+		fsb_gentoo_profile_add packages/static-dev
 		fsb_emerge static-dev
 		fsb_gentoo_unmerge_udev
 		;;
 	(minimal-dev)
-		fsb_gentoo_profile_add -o ccx-bootstrap packages/minimal-dev
+		fsb_gentoo_profile_add packages/minimal-dev
 		fsb_emerge minimal-dev
 		fsb_gentoo_unmerge_udev
 		;;
 	(mdev)
-		fsb_gentoo_profile_add -o ccx-bootstrap packages/mdev
+		fsb_gentoo_profile_add packages/mdev
 		fsb_emerge -N busybox
 		fsb_gentoo_unmerge_udev
 		ln -s /etc/init.d/mdev $build_dir/etc/runlevels/sysinit/mdev

=== modified file 'functions/fsb_target_gentoo_flavor'
--- functions/fsb_target_gentoo_flavor	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_gentoo_flavor	2013-05-29 20:44:33 +0000
@@ -1,8 +1,6 @@
-# vim: ft=zsh noet
 if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_overlays
+	FSB_INFO_DEPEND=gentoo_system
 	FSB_INFO_BASE=%s-$STAGE_GENTOO_FLAVOR
-	FSB_INFO_DIR=%s
 	[[ -n $STAGE_GENTOO_FLAVOR ]] || die 'STAGE_GENTOO_FLAVOR needs to be defined'
 	return
 elif [[ $1 != build ]]; then

=== modified file 'functions/fsb_target_gentoo_gcc'
--- functions/fsb_target_gentoo_gcc	2015-04-22 09:24:39 +0000
+++ functions/fsb_target_gentoo_gcc	2013-09-12 09:53:44 +0000
@@ -1,26 +1,17 @@
 # vim: ft=zsh noet
 if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_init
+	FSB_INFO_DEPEND=gentoo_base
 	FSB_INFO_BASE=%s
 	FSB_INFO_DIR=%s-gcc
 	return
 elif [[ $1 != build ]]; then
 	die "unimplemented action: $*"
 fi
-
-if [[ -d $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE ]]; then
-	rsync -r $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE/ $build_dir/var/portage/packages/ || die "error copying packages from cache"
-fi
-
 if (($+STAGE_GENTOO_GCC)); then
 	echo "=sys-devel/gcc-$STAGE_GENTOO_GCC **" >>$build_dir/etc/portage/package.keywords
 	echo "=sys-devel/gcc-$STAGE_GENTOO_GCC" >>$build_dir/etc/portage/package.unmask
-	fsb_emerge -1ubk "=sys-devel/gcc-$STAGE_GENTOO_GCC"
+	fsb_emerge -1u "=sys-devel/gcc-$STAGE_GENTOO_GCC"
 else
-	fsb_emerge -1ubk sys-devel/gcc
+	fsb_emerge -1u sys-devel/gcc
 fi
-
-mkdir -p $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE
-rsync -r $build_dir/var/portage/packages/ $FSB_BASE_DIR/cache/gcc-$STAGE_GENTOO_MACHINE/ || die "error copying packages to cache"
-
 fsb_gentoo_set_gcc

=== removed file 'functions/fsb_target_gentoo_genkernel'
--- functions/fsb_target_gentoo_genkernel	2015-04-22 09:24:39 +0000
+++ functions/fsb_target_gentoo_genkernel	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# vim: ft=zsh noet
-if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_flavor
-	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s-genkernel
-	return
-elif [[ $1 != build ]]; then
-	die "unimplemented action: $*"
-fi
-echo 'sys-kernel/genkernel' >>$build_dir/etc/portage/package.keywords
-fsb_chroot_bash emerge -n genkernel
-sed --in-place=.orig -f $FSB_SCRIPTS_DIR/genkernel_conf.sed $build_dir/etc/genkernel.conf || \
-	die "failed to configure genkernel"
-fsb_chroot_bash genkernel --lvm --mdadm --e2fsprogs --disklabel \
-	--no-mountboot --symlink --real-root=/dev/mapper/vg-root \
-	all

=== modified file 'functions/fsb_target_gentoo_init'
--- functions/fsb_target_gentoo_init	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_gentoo_init	2013-05-22 19:00:51 +0000
@@ -1,14 +1,13 @@
-# vim: ft=zsh noet
 if [[ $1 == info ]]; then
 	fsb_infer_gentoo_settings
 
-	FSB_INFO_BASE=$FSB_BUILD_DIR/gentoo-${STAGE_GENTOO_PROFILE//\//_}
+	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_BRANCH
 	FSB_INFO_BASE+=-p$STAGE_PORTAGE_TS
-	FSB_INFO_BASE+=-bsp$STAGE_OVERLAY_REVNO[ccx-bootstrap]
+	FSB_INFO_BASE+=-o$STAGE_OVERLAY_REVNO
 	FSB_INFO_DIR=%s-conf
 	FSB_INFO_DEPEND=gentoo_autobuild_stage
 
@@ -17,7 +16,7 @@
 	die "unimplemented action: $*"
 fi
 
-local dir profile profile_link accept_keywords profile_expected
+local dir profile profile_link accept_keywords
 
 case $STAGE_GENTOO_BRANCH in
 	(stable)
@@ -39,15 +38,6 @@
 PORTDIR=${(q)FSB_PORTAGE_SNAPSHOTS}/${STAGE_PORTAGE_TS}
 EOF
 
-if ((${VAR_TMP_TMPFS:-0})); then
-	print -r 'mkdir -p var/tmp' >>$build_dir/chroot.conf || die
-	if (($+TMPFS_SIZE)); then
-		print -r "trymount -t tmpfs -o size=$TMPFS_SIZE tmpfs var/tmp" >>$build_dir/chroot.conf || die
-	else
-		print -r "trymount -t tmpfs tmpfs var/tmp" >>$build_dir/chroot.conf || die
-	fi
-fi
-
 mkdir -p $build_dir/usr/portage || die
 
 mv $build_dir/etc/portage/make.conf{,.orig} || die
@@ -57,7 +47,7 @@
 EMERGE_DEFAULT_OPTS="--verbose --quiet-build=y --keep-going"
 MAKEOPTS="${MAKEOPTS:--j$(cat /proc/cpuinfo | grep '^processor' | wc -l)}"
 
-PORTDIR_OVERLAY="/var/portage/local"
+PORTDIR_OVERLAY="/var/portage/prosys/overlay /var/portage/local"
 PKGDIR="/var/portage/packages"
 DISTDIR="/var/portage/distfiles"
 PORT_LOGDIR="/var/log/portage"
@@ -66,25 +56,14 @@
 PORTAGE_ELOG_SYSTEM="save_summary save"
 EOF
 
-mkdir -p $build_dir/var/portage/{distfiles,packages,local/{metadata,profiles/custom}} || die
+mkdir -p $build_dir/var/portage/{distfiles,packages,local/profiles/custom} || die
 echo local >$build_dir/var/portage/local/profiles/repo_name || die
-echo 'masters = gentoo' >$build_dir/var/portage/local/metadata/layout.conf || die
+bzr branch -r $STAGE_OVERLAY_REVNO $FSB_OVERLAY_SRC $build_dir/var/portage/prosys || die "Failed to branch overlay"
 
 profile_link="$(readlink $build_dir/etc/portage/make.profile)" || die "could not read $build_dir/etc/portage/make.profile"
 [[ -n $profile_link ]] || die "$build_dir/etc/portage/make.profile is invalid"
-profile_expected=../usr/portage/profiles/$STAGE_GENTOO_PROFILE
-[[ $profile_link != $profile_expected ]] || \
-	die $'mismatched profile\nexpected: '${(qqq)profile_expected}$'\ngot: '${(qqq)profile_link}
 mv $build_dir/etc/portage/make.profile{,.orig} || die
 
 profile=/usr/portage/${profile_link#*/portage/}
 ln -s ../../var/portage/local/profiles/custom $build_dir/etc/portage/make.profile || die
-print -r - $profile >>$build_dir/var/portage/local/profiles/custom/parent || die
-fsb_gentoo_overlay_add ccx-bootstrap
-fsb_gentoo_profile_add -o ccx-bootstrap arch/$STAGE_GENTOO_MACHINE
-
-if (($+EATMYDATA)); then
-	echo 'sys-fs/libeatmydata' >>$build_dir/etc/portage/package.keywords || die
-	fsb_emerge -n libeatmydata
-fi
-# vim: ft=zsh noet
+fsb_gentoo_profile_add $profile arch/$STAGE_GENTOO_MACHINE

=== removed file 'functions/fsb_target_gentoo_overlays'
--- functions/fsb_target_gentoo_overlays	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_gentoo_overlays	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# vim: ft=zsh noet
-if [[ $1 == info ]]; then
-	fsb_infer_gentoo_settings
-	FSB_INFO_DEPEND=gentoo_system
-	FSB_INFO_BASE=%s
-	FSB_INFO_BASE+=-pkg$STAGE_OVERLAY_REVNO[ccx-packages]
-	FSB_INFO_BASE+=-pypi$STAGE_OVERLAY_REVNO[ccx-pypi]
-	FSB_INFO_DIR=%s
-	return
-elif [[ $1 != build ]]; then
-	die "unimplemented action: $*"
-fi
-
-fsb_gentoo_overlay_add ccx-packages
-fsb_gentoo_overlay_add ccx-pypi

=== modified file 'functions/fsb_target_gentoo_python'
--- functions/fsb_target_gentoo_python	2014-10-29 14:11:53 +0000
+++ functions/fsb_target_gentoo_python	2013-05-30 17:06:24 +0000
@@ -1,10 +1,7 @@
-# vim: ft=zsh noet
 if [[ $1 == info ]]; then
-	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s
-	FSB_INFO_DEPEND=gentoo_mixins
+	FSB_INFO_DEPEND=gentoo_gcc
 	if (($+STAGE_GENTOO_NOPY3K)); then
-		FSB_INFO_BASE+=-py2
+		FSB_INFO_BASE=%s-py2
 	else
 		FSB_INFO_SKIP=1
 	fi
@@ -12,7 +9,7 @@
 elif [[ $1 != build ]]; then
 	die "unimplemented action: $*"
 fi
-fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/nopy3k
+fsb_gentoo_profile_add mix-ins/nopy3k
 fsb_emerge -1u '=python-2.7*' python-updater portage
 fsb_chroot_bash eselect python set python2.7
 fsb_emerge --unmerge '>=dev-lang/python-3'

=== removed file 'scripts/genkernel_conf.sed'
--- scripts/genkernel_conf.sed	2015-04-22 09:24:39 +0000
+++ scripts/genkernel_conf.sed	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-s|^#\?\(REAL_ROOT=\).*|\1"/dev/mapper/vg-root"|
-s|^#\?\(MAKEOPTS=\).*|\1"-j8"|
-
-s|^#\?\(CLEAN=\).*|\1"no"|
-s|^#\?\(MRPROPER=\).*|\1"no"|
-s|^#\?\(SYMLINK=\).*|\1"yes"|
-s|^#\?\(SAVE_CONFIG=\).*|\1"yes"|
-s|^#\?\(LVM=\).*|\1"yes"|
-s|^#\?\(MDADM=\).*|\1"yes"|
-s|^#\?\(E2FSPROGS=\).*|\1"yes"|
-s|^#\?\(DISKLABEL=\).*|\1"yes"|