=== modified file 'conf/chroot.sh-amd64'
--- conf/chroot.sh-amd64	2011-11-25 17:27:50 +0000
+++ conf/chroot.sh-amd64	2011-11-25 03:44:51 +0000
@@ -2,7 +2,6 @@
 SCRIPT=$(readlink -f $0)
 DIR="`dirname "$SCRIPT"`"
 EXE="${1:-$SHELL}"
-PS4='+\t \s> '
 
 cd "$DIR"
 

=== removed file 'conf/gentoo_scripts/build_stage4.sh'
--- conf/gentoo_scripts/build_stage4.sh	2011-11-25 17:27:50 +0000
+++ conf/gentoo_scripts/build_stage4.sh	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-PS4='+\t \s> '
-emerge -uDN --keep-going $( cat /root/prosys/world )

=== modified file 'conf/gentoo_scripts/rebuild_stage3.sh'
--- conf/gentoo_scripts/rebuild_stage3.sh	2011-11-25 17:27:50 +0000
+++ conf/gentoo_scripts/rebuild_stage3.sh	2011-11-25 03:47:36 +0000
@@ -1,17 +1,13 @@
 #!/bin/bash
-emerge() {
-	/usr/bin/emerge -qv --keep-going $@
-}
-PS4='+\t \s> '
 set -x
 env-update && \
 source /etc/profile && \
-emerge portage && \
-emerge -u gcc && \
+emerge -q portage && \
+emerge -qu gcc && \
 gcc-config `gcc-config -l | awk '{p=$2} END{print p}'` && \
 source /etc/profile && \
-emerge -e @world && \
-emerge -n gentoolkit && \
-/usr/bin/emerge --depclean && \
-emerge @preserved-rebuild && \
-revdep-rebuild -- -qv --keep-going
+emerge -qe @world && \
+emerge -qn gentoolkit && \
+emerge --depclean && \
+emerge -q @preserved-rebuild && \
+revdep-rebuild

=== modified file 'conf/make.conf'
--- conf/make.conf	2011-11-25 17:27:50 +0000
+++ conf/make.conf	2011-11-25 04:20:57 +0000
@@ -1,5 +1,5 @@
 EMERGE_DEFAULT_OPTS="--verbose --quiet --jobs 5"
-MAKEOPTS="-j6 -l7"
+MAKEOPTS="-l7"
 LINGUAS="en cs"
 
 FEATURES="sandbox usersandbox userpriv userfetch"
@@ -14,7 +14,4 @@
 PKGDIR="/var/portage/packages"
 DISTDIR="/var/portage/distfiles"
 
-PORTAGE_ELOG_CLASSES="*"
-PORTAGE_ELOG_SYSTEM="save_summary save echo"
-
 PORTDIR_OVERLAY="/var/portage/ccx-autobuild"

=== removed file 'generate_targets'
--- generate_targets	2011-11-25 17:27:50 +0000
+++ generate_targets	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/zsh
-set -x
-for target in $( ${0:h}/stagebuilder.prolog )
-do
-	${0:h}/stagebuilder.prolog $target $(realpath ${0:h})/build/$target >${0:h}/targets/${target}
-	chmod +x ${0:h}/targets/${target}
-done

=== modified file 'stagebuilder.prolog'
--- stagebuilder.prolog	2011-11-25 17:27:50 +0000
+++ stagebuilder.prolog	2011-11-25 04:23:46 +0000
@@ -483,14 +483,6 @@
 % other auxiliary predicates
 %
 
-set_timezone(Dir, Zone) -->
-    [run([rm, Dir +/+ '/etc/localtime']),
-     run([ln, '-s', '../usr/share/zoneinfo' +/+ Zone, Dir +/+ 'etc/localtime'])
-    ].
-
-set_locale(Dir, Locale) -->
-    [echo_replace('LC_ALL=\'' + Locale + '\'', Dir +/+ 'etc/env.d/02locale')].
-
 create_chroot_script(Dir, Arch) -->
     [run([cp, '-Lp', '--', Conf + '/chroot.sh-' + Arch
                          , Dir +/+ 'chroot.sh'
@@ -517,11 +509,7 @@
          ]),
      run([rsync, '-a', Conf +/+ 'gentoo_scripts/'
                      , Dir +/+ 'root/prosys/'
-         ]),
-     comment('configure local settings')
-    ],
-    set_timezone(Dir, 'Europe/Prague'),
-    set_locale(Dir, 'en_US.UTF-8').
+         ])].
 
 gentoo_build_stage3(Name, Dir) -->
     get_portage_timestamp(Dir, PortageVer),
@@ -532,7 +520,7 @@
     get_portage_timestamp(Dir, PortageVer),
     [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])],
     create_stage(Name + '_stage3-p' + PortageVer, Dir),
-    [chroot(Dir, ['/root/prosys/build_stage4.sh'])],
+    [chroot(Dir, ['emerge -uDN $( cat /root/prosys/world )'])],
     create_stage(Name + '_stage4-p' + PortageVer, Dir).
 
 %