=== removed file 'configs/amd64_desktop_enlightenment'
--- configs/amd64_desktop_enlightenment	2015-06-19 16:54:27 +0000
+++ configs/amd64_desktop_enlightenment	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-source $0:h/desktop
-STAGE_GENTOO_NAME=latest-stage3-amd64
-STAGE_GENTOO_PROFILE=default/linux/amd64/13.0
-STAGE_GENTOO_FLAVOR=enlightenment-desktop

=== removed file 'configs/amd64_desktop_xmonad'
--- configs/amd64_desktop_xmonad	2015-06-19 16:54:27 +0000
+++ configs/amd64_desktop_xmonad	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-source $0:h/desktop_thin
-STAGE_GENTOO_NAME=latest-stage3-amd64
-STAGE_GENTOO_PROFILE=default/linux/amd64/13.0

=== removed file 'configs/amd64_hardened_vserver_master'
--- configs/amd64_hardened_vserver_master	2015-06-19 16:54:27 +0000
+++ configs/amd64_hardened_vserver_master	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-source $0:h/amd64_hardened_vserver
-STAGE_GENTOO_FLAVOR=vserver-master

=== removed file 'configs/amd64_hardened_vserver_spark'
--- configs/amd64_hardened_vserver_spark	2015-06-19 16:54:27 +0000
+++ configs/amd64_hardened_vserver_spark	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-source $0:h/amd64_hardened_vserver
-STAGE_GENTOO_FLAVOR=vserver-spark

=== modified file 'configs/desktop'
--- configs/desktop	2015-06-19 16:54:27 +0000
+++ configs/desktop	2015-04-22 09:24:39 +0000
@@ -2,7 +2,7 @@
 STAGE_GENTOO_DEV=mdev
 STAGE_GENTOO_PORTAGE22=1
 STAGE_GENTOO_NOPY3K=1
-STAGE_GENTOO_MIXINS="base nokit"
+STAGE_GENTOO_MIXINS="base nokit nodbus"
 #STAGE_GENTOO_GCC=4.8.1-r1
 STAGE_GENTOO_EMPTYTREE=1
 STAGE_GENTOO_FLAVOR=desktop

=== removed file 'configs/desktop_thin'
--- configs/desktop_thin	2015-06-19 16:54:27 +0000
+++ configs/desktop_thin	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-source $0:h/desktop
-STAGE_GENTOO_MIXINS="$STAGE_GENTOO_MIXINS nodbus"
-STAGE_GENTOO_FLAVOR=xmonad-desktop

=== modified file 'functions/fsb_target_gentoo_flavor'
--- functions/fsb_target_gentoo_flavor	2015-06-19 16:54:27 +0000
+++ functions/fsb_target_gentoo_flavor	2014-10-29 14:11:53 +0000
@@ -9,9 +9,6 @@
 	die "unimplemented action: $*"
 fi
 fsb_gentoo_profile_add flavor/$STAGE_GENTOO_FLAVOR
-# fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/circlebreak
 print '@profile' >>$build_dir/var/lib/portage/world_sets
-fsb_emerge -uDN @world
-# sed -i '/circlebreak/d' $build_dir/var/portage/local/profiles/custom/parent || die
-# fsb_emerge -uDN @world
+fsb_chroot_bash emerge -uDN @world
 fsb_gentoo_post_update

=== modified file 'functions/fsb_target_gentoo_system'
--- functions/fsb_target_gentoo_system	2015-06-19 16:54:27 +0000
+++ functions/fsb_target_gentoo_system	2015-04-22 09:27:14 +0000
@@ -12,8 +12,6 @@
 	die "unimplemented action: $*"
 fi
 
-fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/circlebreak
-
 if (($+STAGE_GENTOO_EMPTYTREE)); then
 	fsb_emerge --emptytree @world
 else
@@ -22,6 +20,4 @@
 	fsb_emerge -uDN @world
 fi
 fsb_emerge -n gentoolkit
-sed -i '/circlebreak/d' $build_dir/var/portage/local/profiles/custom/parent || die
-fsb_emerge -uDN @world
 fsb_gentoo_post_update