=== modified file 'conf/chroot.sh-amd64'
--- conf/chroot.sh-amd64	2012-01-18 17:27:32 +0000
+++ conf/chroot.sh-amd64	2011-11-25 17:27:50 +0000
@@ -19,8 +19,6 @@
                 environ+=( "${key}=${NEW_ENV[$key]}" )
         done
         env -i - "${environ[@]}" setarch x86_64 chroot . "$@"
-        RET=$?
-        echo "command $* returned $RET"
 }
 
 UMOUNT=""
@@ -50,8 +48,6 @@
 trymount --bind {/,}usr/portage
 [[ -d var/portage/distfiles ]] && \
 trymount --bind {/,}var/portage/distfiles
-[[ -d var/portage/ccache ]] && \
-trymount --bind /var/prosys/ccache/amd64 var/portage/ccache
 
 trymount -t tmpfs -o size=3G tmpfs var/tmp
 trymount -t tmpfs tmpfs tmp
@@ -68,11 +64,11 @@
 #fi
 
 do_chroot "$EXE"
+RET=$?
 
 for M in $UMOUNT
 do
         echo "unmouting $M"
         umount "$M"
 done
-set -x
-exit $RET
+exit $?

=== modified file 'conf/gentoo_scripts/rebuild_stage3.sh'
--- conf/gentoo_scripts/rebuild_stage3.sh	2012-01-18 17:27:32 +0000
+++ conf/gentoo_scripts/rebuild_stage3.sh	2011-11-25 17:27:50 +0000
@@ -1,12 +1,12 @@
 #!/bin/bash
 emerge() {
-	/usr/bin/emerge --quiet-build=y --verbose --keep-going $@
+	/usr/bin/emerge -qv --keep-going $@
 }
 PS4='+\t \s> '
 set -x
 env-update && \
 source /etc/profile && \
-emerge portage ccache && \
+emerge portage && \
 emerge -u gcc && \
 gcc-config `gcc-config -l | awk '{p=$2} END{print p}'` && \
 source /etc/profile && \

=== modified file 'conf/make.conf'
--- conf/make.conf	2012-01-18 17:27:32 +0000
+++ conf/make.conf	2011-11-25 17:27:50 +0000
@@ -2,7 +2,7 @@
 MAKEOPTS="-j6 -l7"
 LINGUAS="en cs"
 
-FEATURES="sandbox usersandbox userpriv userfetch ccache"
+FEATURES="sandbox usersandbox userpriv userfetch"
 
 GENTOO_MIRRORS="
 	ftp://ftp.fi.muni.cz/pub/linux/gentoo/
@@ -13,8 +13,6 @@
 PORT_LOGDIR="/var/log/portage"
 PKGDIR="/var/portage/packages"
 DISTDIR="/var/portage/distfiles"
-CCACHE_DIR="/var/portage/ccache"
-CCACHE_SIZE="10G"
 
 PORTAGE_ELOG_CLASSES="*"
 PORTAGE_ELOG_SYSTEM="save_summary save echo"

=== modified file 'scripts/build_gentoo_stage4'
--- scripts/build_gentoo_stage4	2012-01-18 17:27:32 +0000
+++ scripts/build_gentoo_stage4	2012-01-18 00:37:28 +0000
@@ -6,7 +6,7 @@
 
 summary=$1/var/log/portage/elog/summary.log
 last=$( stat -c %Y $summary )
-until $1/chroot.sh /root/prosys/build_stage4.sh
+until $1/root/prosys/build_stage4.sh
 do
 	new=$( stat -c %Y $summary )
 	if [[ $last == $new ]]

=== modified file 'stagebuilder.pl'
--- stagebuilder.pl	2012-01-18 17:27:32 +0000
+++ stagebuilder.pl	2012-01-18 00:37:28 +0000
@@ -390,7 +390,7 @@
     ].
 
 set_locale(Dir, Locale) -->
-    [echo_replace('LC_ALL="' + Locale + '"', Dir +/+ 'etc/env.d/02locale')].
+    [echo_replace('LC_ALL=\'' + Locale + '\'', Dir +/+ 'etc/env.d/02locale')].
 
 create_chroot_script(Dir, Arch) -->
     [run([cp, '-Lp', '--', Conf + '/chroot.sh-' + Arch
@@ -408,7 +408,7 @@
     {gentoo_stage(Name, ArchName, _)},
     download_gentoo_stage(Tarball, Name),
     prepend([comment('prepare build directory')
-            ,run([mkdir, '-p', Dir +/+ 'usr/portage', Dir +/+ 'var/portage/ccache'])
+            ,run([mkdir, '-p', Dir +/+ 'usr/portage', Dir +/+ 'var/portage'])
             ]),
     unpack_tarball(Tarball, Dir),
     create_chroot_script(Dir, ArchName),
@@ -484,7 +484,7 @@
             network_utilities, filesystem_utilities,
             base_x11, base_media
         ]),
-    gentoo_build_stage4(amd64_testing_x11, Dir).
+    gentoo_build_stage4(amd64_testing, Dir).
 
 target(amd64_hardened_vshost, Dir) -->
     create_gentoo_builddir(amd64_hardened, Dir),
@@ -528,7 +528,7 @@
 
 main([Name, Dir]) :-
     target(Commands, Name, Dir),
-    print('#!/bin/zsh -x\n\n# Generated by ProSys stagebuilder\n# Stage name: '),
+    print('#!/bin/zsh\n\n# Generated by ProSys stagebuilder\n# Stage name: '),
     print(Name), nl,
     print_cmds(Commands).