=== modified file 'functions/fsb_target_gentoo_gcc'
--- functions/fsb_target_gentoo_gcc	2016-07-12 08:34:05 +0000
+++ functions/fsb_target_gentoo_gcc	2016-02-26 21:56:10 +0000
@@ -16,8 +16,8 @@
 
 local gcc_pkg
 if (($+STAGE_GENTOO_GCC)); then
-	echo "=sys-devel/gcc-$STAGE_GENTOO_GCC **" >>$build_dir/etc/portage/package.keywords/fsb
-	echo "=sys-devel/gcc-$STAGE_GENTOO_GCC" >>$build_dir/etc/portage/package.unmask/fsb
+	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
 	gcc_pkg=sys-devel/gcc-$STAGE_GENTOO_GCC
 else
 	gcc_pkg=sys-devel/gcc

=== modified file 'functions/fsb_target_gentoo_genkernel'
--- functions/fsb_target_gentoo_genkernel	2016-07-12 08:34:05 +0000
+++ functions/fsb_target_gentoo_genkernel	2016-02-26 21:56:10 +0000
@@ -7,7 +7,7 @@
 elif [[ $1 != build ]]; then
 	die "unimplemented action: $*"
 fi
-echo 'sys-kernel/genkernel' >>$build_dir/etc/portage/package.keywords/fsb
+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"

=== modified file 'functions/fsb_target_gentoo_init'
--- functions/fsb_target_gentoo_init	2016-07-12 08:34:05 +0000
+++ functions/fsb_target_gentoo_init	2016-02-26 21:56:10 +0000
@@ -50,14 +50,6 @@
 
 mkdir -p $build_dir/usr/portage || die
 
-for dir in $dir in $build_dir/etc/portage/package.{mask,keywords,use}; do
-	if [[ -f $dir ]]; then
-		mv $dir $dir.orig || die
-		mkdir $dir || die
-		mv $dir.orig $dir/orig || die
-	fi
-done
-
 mv $build_dir/etc/portage/make.conf{,.orig} || die
 cat >>$build_dir/etc/portage/make.conf <<EOF
 ACCEPT_KEYWORDS="${accept_keywords}"
@@ -99,7 +91,7 @@
 done
 
 if (($+EATMYDATA)); then
-	echo 'sys-fs/libeatmydata' >>$build_dir/etc/portage/package.keywords/fsb
+	echo 'sys-fs/libeatmydata' >>$build_dir/etc/portage/package.keywords || die
 	fsb_emerge -n libeatmydata
 fi
 # vim: ft=zsh noet