=== modified file 'functions/fsb_target_gentoo_dev'
--- functions/fsb_target_gentoo_dev	2013-05-15 12:00:28 +0000
+++ functions/fsb_target_gentoo_dev	2013-05-14 21:30:51 +0000
@@ -9,7 +9,9 @@
 [[ $? -eq 100 ]] || die "build_dir_check failed"
 
 build_dir_push $dir
-build_target gentoo_python
+build_target gentoo_base
+
+
 
 case $STAGE_GENTOO_DEV in
 	(static-dev)

=== removed file 'functions/fsb_target_gentoo_gcc'
--- functions/fsb_target_gentoo_gcc	2013-05-15 12:00:28 +0000
+++ functions/fsb_target_gentoo_gcc	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-local dir
-
-fsb_infer_gentoo_settings
-
-dir=$STAGE_GENTOO_DIR_BASE
-dir+=-gcc
-
-build_dir_check $dir $0 && return 0
-[[ $? -eq 100 ]] || die "build_dir_check failed"
-
-build_dir_push $dir
-build_target gentoo_base
-
-fsb_chroot_bash emerge -1u sys-devel/gcc
-$dir/chroot.sh /bin/bash -l -c "gcc-config \$(gcc-config -l | awk '{p=\$2} END{print p}')"

=== renamed file 'functions/fsb_target_gentoo_python' => 'functions/fsb_target_gentoo_py2'
--- functions/fsb_target_gentoo_python	2013-05-15 12:00:28 +0000
+++ functions/fsb_target_gentoo_py2	2013-05-14 18:56:42 +0000
@@ -9,12 +9,10 @@
 [[ $? -eq 100 ]] || die "build_dir_check failed"
 
 build_dir_push $dir
-build_target gentoo_gcc
+build_target gentoo_base
 
-if (($+STAGE_GENTOO_NOPY3K)); then
-	fsb_gentoo_profile_add mix-ins/nopy3k
-	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
-fi
+fsb_gentoo_profile_add mix-ins/nopy3k
+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

=== modified file 'functions/fsb_target_gentoo_system'
--- functions/fsb_target_gentoo_system	2013-05-15 12:00:28 +0000
+++ functions/fsb_target_gentoo_system	2013-05-14 21:30:51 +0000
@@ -13,13 +13,12 @@
 [[ $? -eq 100 ]] || die "build_dir_check failed"
 
 build_dir_push $dir
-build_target gentoo_dev
-
-if (($+STAGE_GENTOO_EMPTYTREE)); then
-	fsb_chroot_bash emerge --emptytree @world
+if (($+STAGE_GENTOO_NOPY3K)); then
+	build_target gentoo_py2
 else
-	fsb_chroot_bash emerge -uDN @world
+	build_target gentoo_base
 fi
-fsb_chroot_bash emerge -n gentoolkit
+
+fsb_chroot_bash emerge -uDN @world
 fsb_chroot_bash emerge --depclean
 fsb_chroot_bash revdep-rebuild