=== removed file 'configs/alix_base_musl'
--- configs/alix_base_musl	2016-02-26 21:56:10 +0000
+++ configs/alix_base_musl	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-source $0:h/base
-STAGE_GENTOO_ARCH=x86
-STAGE_GENTOO_NAME=stage3-i686-musl-vanilla
-STAGE_GENTOO_TARBALL_URL=$FSB_GENTOO_MIRROR/stage3-i686-musl-vanilla-20151004.tar.bz2
-STAGE_GENTOO_PROFILE=hardened/linux/musl/x86
-STAGE_GENTOO_MACHINE=geode-musl
-unset EATMYDATA  # fails on musl

=== modified file 'configs/alix_efl_analyzer'
--- configs/alix_efl_analyzer	2016-02-26 21:56:10 +0000
+++ configs/alix_efl_analyzer	2015-10-02 16:11:55 +0000
@@ -1,5 +1,4 @@
-#source $0:h/alix_base
-source $0:h/alix_base_musl
+source $0:h/alix_base
 STAGE_GENTOO_FLAVOR=efl-analyzer
 STAGE_GENTOO_BRANCH=testing
 STAGE_GENTOO_DEV=udev

=== removed file 'configs/alpine-amd64-edge_postfix'
--- configs/alpine-amd64-edge_postfix	2016-02-26 21:56:10 +0000
+++ configs/alpine-amd64-edge_postfix	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-source $0:h/alpine-amd64-edge
-STAGE_ALPINE_PACKAGES=( rsync mksh zsh runit findutils postfix opendkim policyd-spf-fs postgrey make perl-netaddr-ip )

=== removed file 'configs/alpine-amd64-edge_unbound'
--- configs/alpine-amd64-edge_unbound	2016-02-26 21:56:10 +0000
+++ configs/alpine-amd64-edge_unbound	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-source $0:h/alpine-amd64-edge
-STAGE_ALPINE_PACKAGES=( rsync mksh zsh runit findutils dnssec-root unbound )
-

=== removed file 'configs/amd64_hardened_vserver_sogo'
--- configs/amd64_hardened_vserver_sogo	2016-02-26 21:56:10 +0000
+++ configs/amd64_hardened_vserver_sogo	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-source $0:h/amd64_hardened_vserver
-STAGE_GENTOO_FLAVOR=vserver-sogo

=== removed file 'configs/n2600_base'
--- configs/n2600_base	2016-02-26 21:56:10 +0000
+++ configs/n2600_base	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-source $0:h/base
-STAGE_GENTOO_NAME=latest-stage3-i686
-STAGE_GENTOO_PROFILE=default/linux/x86/13.0
-STAGE_GENTOO_MACHINE=atom_n2600

=== removed file 'configs/n2600_efl_analyzer'
--- configs/n2600_efl_analyzer	2016-02-26 21:56:10 +0000
+++ configs/n2600_efl_analyzer	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-source $0:h/n2600_base
-STAGE_GENTOO_FLAVOR=efl-analyzer
-STAGE_GENTOO_BRANCH=testing
-STAGE_GENTOO_DEV=udev
-STAGE_GENTOO_PORTAGE22=1
-STAGE_GENTOO_NOPY3K=1
-STAGE_GENTOO_MIXINS="base nokit nogtk3"
-STAGE_GENTOO_EMPTYTREE=1

=== removed file 'configs/x86_vserver'
--- configs/x86_vserver	2016-02-26 21:56:10 +0000
+++ configs/x86_vserver	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-source $0:h/vserver
-STAGE_GENTOO_NAME=latest-stage3-i686
-STAGE_GENTOO_PROFILE=default/linux/x86/13.0
-STAGE_GENTOO_MACHINE=i686

=== modified file 'fsbrc'
--- fsbrc	2016-02-26 21:56:10 +0000
+++ fsbrc	2014-10-29 14:11:53 +0000
@@ -6,4 +6,3 @@
 VAR_TMP_TMPFS=1
 TMPFS_SIZE=16G
 FSB_ALPINE_MIRROR=http://dl-3.alpinelinux.org/alpine/
-FSB_GENTOO_MIRROR=ftp://ftp.fi.muni.cz/pub/linux/gentoo/

=== modified file 'functions/fsb_emerge'
--- functions/fsb_emerge	2016-02-26 21:56:10 +0000
+++ functions/fsb_emerge	2013-05-30 17:19:16 +0000
@@ -1,5 +1,3 @@
 typeset -g FSB_EMERGE_JOBS
 : ${FSB_EMERGE_JOBS:=$(cat /proc/cpuinfo | grep '^processor' | wc -l)}
-# disable userpriv as cmake has trouble with non-readable/setuid executables
-# gentoo bug 486270, https://cmake.org/Bug/view.php?id=10468
-fsb_chroot_bash FEATURES=-userpriv emerge --jobs $FSB_EMERGE_JOBS "$@"
+fsb_chroot_bash emerge --jobs $FSB_EMERGE_JOBS "$@"

=== modified file 'functions/fsb_target_gentoo_gcc'
--- functions/fsb_target_gentoo_gcc	2016-02-26 21:56:10 +0000
+++ functions/fsb_target_gentoo_gcc	2015-08-14 10:00:17 +0000
@@ -14,21 +14,12 @@
 	rsync -r $pkgcache/ $build_dir/var/portage/packages/ || die "error copying packages from cache"
 fi
 
-local gcc_pkg
 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
-	gcc_pkg=sys-devel/gcc-$STAGE_GENTOO_GCC
-else
-	gcc_pkg=sys-devel/gcc
-fi
-
-
-if ! $build_dir/chroot.sh /usr/bin/binutils-config -l; then
-	fsb_emerge -1bk binutils
-	fsb_emerge -1bk $gcc_pkg
-else
-	fsb_emerge -1ubk binutils $gcc_pkg
+	fsb_emerge -1ubk "=sys-devel/gcc-$STAGE_GENTOO_GCC"
+else
+	fsb_emerge -1ubk sys-devel/gcc
 fi
 
 mkdir -p $pkgcache

=== modified file 'functions/fsb_target_gentoo_genkernel'
--- functions/fsb_target_gentoo_genkernel	2016-02-26 21:56:10 +0000
+++ functions/fsb_target_gentoo_genkernel	2015-08-14 10:00:17 +0000
@@ -11,61 +11,9 @@
 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"
-$build_dir/chroot.sh /bin/bash --login -c 'genkernel bzImage --no-mountboot --kernel-cc=/bin/false' && \
-	fsb_warn "genkernel reported success even when it should fail"
-local conf
-conf=$build_dir/usr/src/linux/.config
-[[ -f $conf ]] || die "Kernel .config is not a plain file"
-
-# ed -s $build_dir/usr/src/linux/.config <$FSB_SCRIPTS_DIR/kernel_conf.ed || die '.config ed script failed'
-
-fsb_cond_ed $conf '^CONFIG_NF_NAT=[ym]' '$a
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-.'
-
-fsb_cond_ed $conf '^CONFIG_NETFILTER_XT_NAT=[ym]' '$a
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-.'
-
-fsb_cond_ed $conf '^CONFIG_NF_NAT_IPV4=[ym]' '/^# CONFIG_NF_NAT_IPV4 is not set$/c
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-.'
-
-fsb_cond_ed $conf '^CONFIG_IP_NF_NAT=[ym]' '/^# CONFIG_IP_NF_NAT is not set$/c
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-.'
-
-fsb_cond_ed $conf '^CONFIG_DUMMY=m' '/^# CONFIG_DUMMY is not set$/c
-CONFIG_DUMMY=m
-.'
-
-fsb_cond_ed $conf \! '^CONFIG_USB_XHCI_HCD=' '/^CONFIG_USB_XHCI_HCD=m$/c
-# CONFIG_USB_XHCI_HCD is not set
-.
-/^CONFIG_USB_XHCI_PCI=m$/d
-'
-
-fsb_cond_ed $conf \! '^CONFIG_BUILD_DOCSRC' '/^CONFIG_BUILD_DOCSRC=/c
-# CONFIG_BUILD_DOCSRC is not set
-.'
-
+fsb_chroot_bash genkernel kernel --no-mountboot || die "genkernel failure"
+# possible symlink attack :-/
+ed -s $build_dir/usr/src/linux/.config <$FSB_SCRIPTS_DIR/kernel_conf.ed || die '.config ed script failed'
 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	2016-02-26 21:56:10 +0000
+++ functions/fsb_target_gentoo_init	2014-10-29 14:11:53 +0000
@@ -83,13 +83,6 @@
 fsb_gentoo_overlay_add ccx-bootstrap
 fsb_gentoo_profile_add -o ccx-bootstrap arch/$STAGE_GENTOO_MACHINE
 
-local ovr
-for ovr in musl; do
-	if [[ -e $build_dir/var/portage/$ovr ]]; then
-		sed -i "s|PORTDIR_OVERLAY=[\"']|&/var/portage/$ovr |" $build_dir/etc/portage/make.conf || die
-	fi
-done
-
 if (($+EATMYDATA)); then
 	echo 'sys-fs/libeatmydata' >>$build_dir/etc/portage/package.keywords || die
 	fsb_emerge -n libeatmydata

=== modified file 'functions/fsb_target_gentoo_python'
--- functions/fsb_target_gentoo_python	2016-02-26 21:56:10 +0000
+++ functions/fsb_target_gentoo_python	2014-10-29 14:11:53 +0000
@@ -12,16 +12,8 @@
 elif [[ $1 != build ]]; then
 	die "unimplemented action: $*"
 fi
-emerge -1uN portage
 fsb_gentoo_profile_add -o ccx-bootstrap mix-ins/nopy3k
+fsb_emerge -1u '=python-2.7*' python-updater portage
 fsb_chroot_bash eselect python set python2.7
-fsb_emerge -uvDN @world
-fsb_emerge -1u '=python-2.7*' python-updater portage
-fsb_emerge --depclean
+fsb_emerge --unmerge '>=dev-lang/python-3'
 fsb_chroot_bash python-updater
-# emerge -1uN portage
-# fsb_emerge --unmerge '>=dev-lang/python-3'
-# fsb_chroot_bash python-updater
-# fsb_chroot_bash eselect python set python2.7
-# fsb_emerge --unmerge '>=dev-lang/python-3'
-# fsb_emerge -1u portage

=== modified file 'scripts/kernel_conf.ed'
--- scripts/kernel_conf.ed	2016-02-26 21:56:10 +0000
+++ scripts/kernel_conf.ed	2015-10-02 16:11:55 +0000
@@ -34,7 +34,4 @@
 # CONFIG_USB_XHCI_HCD is not set
 .
 /^CONFIG_USB_XHCI_PCI=m$/d
-/^CONFIG_BUILD_DOCSRC=/c
-# CONFIG_BUILD_DOCSRC is not set
-.
 w