=== modified file 'conf/make.conf'
--- conf/make.conf	2011-11-25 04:20:57 +0000
+++ conf/make.conf	2011-10-23 04:06:19 +0000
@@ -1,14 +1,9 @@
-EMERGE_DEFAULT_OPTS="--verbose --quiet --jobs 5"
-MAKEOPTS="-l7"
+MAKEOPTS="-j4"
 LINGUAS="en cs"
 
 FEATURES="sandbox usersandbox userpriv userfetch"
 
-GENTOO_MIRRORS="
-	ftp://ftp.fi.muni.cz/pub/linux/gentoo/
-	ftp://ftp.linux.cz/pub/linux/gentoo/
-	http://ftp.sh.cvut.cz/gentoo
-"
+GENTOO_MIRRORS="${GENTOO_MIRRORS} http://ftp.sh.cvut.cz/gentoo"
 
 PORT_LOGDIR="/var/log/portage"
 PKGDIR="/var/portage/packages"

=== modified file 'stagebuilder.prolog'
--- stagebuilder.prolog	2011-11-25 04:20:57 +0000
+++ stagebuilder.prolog	2011-11-25 03:26:16 +0000
@@ -333,6 +333,7 @@
               ,[package_world('app-editors/vim')
                ]
               ,['vim', 'vim-pager', 'vim-syntax']).
+
 gentoo_package(zsh
               ,[package_world('app-shells/zsh')
                ,package_world('app-shells/zsh-completion')
@@ -366,11 +367,6 @@
 
 gentoo_package(Name, Echos, []) :- gentoo_package(Name, Echos).
 
-gentoo_package(nokit
-               ,[package_mask('sys-auth/polkit')
-               ,package_mask('sys-auth/consolekit')
-               ],[],[ policykit, consolekit, udisks, gdu ]).
-
 gentoo_package(Name, Echos, UseEnabled, []) :-
     gentoo_package(Name, Echos, UseEnabled).
 
@@ -489,7 +485,7 @@
          ])],
     {site_conf_dir(Conf)}.
 
-get_portage_timestamp(_Dir, variable(portage_timestamp)) -->
+get_portage_timestamp(Dir, variable(portage_timestamp)) -->
     {script_dir(Script)},
     [run_outvar([Script +/+ portage_timestamp, '/usr/portage'],
                 portage_timestamp
@@ -541,7 +537,7 @@
     [chroot(Dir, ['/root/prosys/rebuild_stage3.sh'])],
     gentoo_build_stage3(i686_hardened, Dir).
 
-target(amd64_testing, Dir) -->
+target(amd64_hardened_vshost, Dir) -->
     create_gentoo_builddir(amd64_hardened, Dir),
     {dir_make_conf(Dir, Make_conf)},
     reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}'
@@ -549,21 +545,6 @@
     [echo_append('ACCEPT_KEYWORDS="~amd64"', Make_conf)],
     append_site_make_conf(Dir),
     configure_gentoo_packages(Dir
-                             ,[portage22, nopy3k, vim, mc, % nokit,
-			       portage_utilities,
-                               base_utilities, base_system, base_network,
-                               network_utilities, filesystem_utilities
-                              ]),
-    gentoo_build_stage4(amd64_testing, Dir).
-
-target(amd64_hardened_vshost, Dir) -->
-    create_gentoo_builddir(amd64, Dir),
-    {dir_make_conf(Dir, Make_conf)},
-    reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}'
-                   ,'amd64-pc-linux-gnu'),
-    [echo_append('ACCEPT_KEYWORDS="~amd64"', Make_conf)],
-    append_site_make_conf(Dir),
-    configure_gentoo_packages(Dir
                              ,[portage22, nopy3k,
                                base_utilities, base_system, base_network,
                                network_utilities, filesystem_utilities