=== modified file '.bzrignore'
--- .bzrignore	2017-05-31 14:45:10 +0000
+++ .bzrignore	2013-05-13 22:55:00 +0000
@@ -1,5 +1,2 @@
 build
 downloads
-cache
-done
-packages

=== modified file 'configs/amd64_desktop_minimal'
--- configs/amd64_desktop_minimal	2017-05-31 14:45:10 +0000
+++ configs/amd64_desktop_minimal	2017-04-11 16:44:24 +0000
@@ -2,4 +2,3 @@
 STAGE_GENTOO_NAME=latest-stage3-amd64
 STAGE_GENTOO_PROFILE=default/linux/amd64/13.0
 STAGE_GENTOO_FLAVOR=minimal-desktop
-FSB_TARGET=gentoo_bootloader

=== modified file 'configs/amd64_hardened_server'
--- configs/amd64_hardened_server	2017-05-31 14:45:10 +0000
+++ configs/amd64_hardened_server	2016-05-31 14:30:23 +0000
@@ -8,5 +8,5 @@
 STAGE_GENTOO_NOPY3K=1
 #STAGE_GENTOO_MIXINS="base nokit nodbus nox"
 STAGE_GENTOO_FLAVOR=server
-FSB_TARGET=gentoo_buildpkg
+FSB_TARGET=gentoo_flavor
 typeset -g -a STAGE_GENTOO_OVERLAYS

=== modified file 'configs/amd64_server'
--- configs/amd64_server	2017-05-31 14:45:10 +0000
+++ configs/amd64_server	2014-10-29 14:11:53 +0000
@@ -5,5 +5,5 @@
 STAGE_GENTOO_DEV=mdev
 STAGE_GENTOO_NOPY3K=1
 STAGE_GENTOO_FLAVOR=server
-FSB_TARGET=gentoo_buildpkg
+FSB_TARGET=gentoo_flavor
 

=== modified file 'configs/vserver'
--- configs/vserver	2017-05-31 14:45:10 +0000
+++ configs/vserver	2017-04-11 16:44:24 +0000
@@ -3,5 +3,5 @@
 STAGE_GENTOO_DEV=minimal-dev
 #STAGE_GENTOO_NOPY3K=1
 STAGE_GENTOO_FLAVOR=vserver
-FSB_TARGET=gentoo_buildpkg
+FSB_TARGET=gentoo_flavor
 # vim: ft=zsh noet

=== removed file 'functions/fsb_target_gentoo_buildpkg'
--- functions/fsb_target_gentoo_buildpkg	2017-05-31 14:45:10 +0000
+++ functions/fsb_target_gentoo_buildpkg	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# vim: ft=zsh noet
-if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_flavor
-	FSB_INFO_BASE=%s
-	FSB_INFO_DIR=%s-buildpkg
-	if ! (($+FSB_TARGET_NAME)); then
-		FSB_INFO_SKIP=1
-	fi
-	return
-elif [[ $1 != build ]]; then
-	die "unimplemented action: $*"
-fi
-
-local pkgdir
-pkgdir=$FSB_BASE_DIR/packages/$FSB_TARGET_NAME
-mkdir -p $pkgdir || die "Could not make directory: $pkgdir"
-mkdir -p $build_dir/var/portage/packages \
-	|| die "Could not make directory: $build_dir/var/portage/packages"
-printf "%s\n" "trymount --bind ${(qqq)pkgdir} var/portage/packages" \
-	>>$build_dir/chroot.conf \
-	|| die "Could not write package mount information"
-$build_dir/chroot.sh /bin/bash --login \
-	-c 'eix-installed -= -a | xargs quickpkg --include-unmodified-config y' \
-	|| die "Building binary packages failed"

=== modified file 'functions/fsb_target_gentoo_genkernel'
--- functions/fsb_target_gentoo_genkernel	2017-05-31 14:45:10 +0000
+++ functions/fsb_target_gentoo_genkernel	2016-07-12 08:34:05 +0000
@@ -1,6 +1,6 @@
 # vim: ft=zsh noet
 if [[ $1 == info ]]; then
-	FSB_INFO_DEPEND=gentoo_buildpkg
+	FSB_INFO_DEPEND=gentoo_flavor
 	FSB_INFO_BASE=%s
 	FSB_INFO_DIR=%s-genkernel
 	return

=== modified file 'functions/fsb_target_gentoo_init'
--- functions/fsb_target_gentoo_init	2017-05-31 14:45:10 +0000
+++ functions/fsb_target_gentoo_init	2016-07-12 08:34:05 +0000
@@ -99,8 +99,7 @@
 done
 
 if (($+EATMYDATA)); then
-	mkdir -p $build_dir/etc/portage/package.keywords || die "could not create directory: $build_dir/etc/portage/package.keywords"
-	echo 'sys-fs/libeatmydata' >>$build_dir/etc/portage/package.keywords/fsb || die "could not unmask sys-fs/libeatmydata"
+	echo 'sys-fs/libeatmydata' >>$build_dir/etc/portage/package.keywords/fsb
 	fsb_emerge -n libeatmydata
 fi
 # vim: ft=zsh noet

=== modified file 'functions/fsb_target_gentoo_python'
--- functions/fsb_target_gentoo_python	2017-05-31 14:45:10 +0000
+++ functions/fsb_target_gentoo_python	2017-04-11 16:44:24 +0000
@@ -12,7 +12,7 @@
 elif [[ $1 != build ]]; then
 	die "unimplemented action: $*"
 fi
-fsb_emerge -1uN portage sandbox
+fsb_emerge -1uN portage
 fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/nopy3k
 fsb_chroot_bash eselect python set python2.7
 fsb_emerge --backtrack=35 -uvDN @world