=== modified file 'stagebuilder.pl'
--- stagebuilder.pl	2012-03-28 19:57:28 +0000
+++ stagebuilder.pl	2012-03-26 00:01:55 +0000
@@ -194,14 +194,8 @@
         package_world('ccx-meta/portage-utilities')
     ]).
 gentoo_package(wifi, [
-        package_world('net-wireless/wireless-tools'),
-        package_world('net-wireless/wpa_supplicant')
-    ]).
-gentoo_package(vs_backup, [
-        package_world('app-backup/rsnapshot'),
-        package_world('sys-fs/squashfs-tools')
-    ], [
-        gzip, lzma, lzo, xattr
+    package_world('net-wireless/wireless-tools'),
+    package_world('net-wireless/wpa_supplicant')
     ]).
 
 gentoo_package(bindist, [], [bindist]).
@@ -267,6 +261,11 @@
     ], [
         ssl,ipv6
     ]).
+gentoo_package(vserver_init, [
+        package_world('sys-cluster/vserver-init')
+    ], [
+        vserver
+    ]).
 gentoo_package(picker_deps, [
         package_world('media-gfx/graphviz'),
         package_world('dev-python/twisted'),
@@ -311,14 +310,6 @@
     ], [
         pulseaudio
     ]).
-gentoo_package(vserver, [
-        package_world('sys-cluster/vserver-init'),
-        package_mask('sys-fs/udev')
-    ], [
-        vserver
-    ], [
-        udev
-    ]).
 
 gentoo_package(Name, Echos, UseEnabled, []) :-
     gentoo_package(Name, Echos, UseEnabled).
@@ -771,21 +762,6 @@
             development_utilities, latex
         ]).
 
-target_gentoo(Name, amd64_hardened, 4, Dir, AddCommands) -->
-    { gentoo_vserver(VSName, AddPackages)
-    , appendn('vserver_', VSName, Name)},
-    reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}' ,'amd64-pc-linux-gnu'),
-    prepend(AddCommands),
-    configure_gentoo_packages(Dir ,[
-            portage22, vim, nokit,
-            portage_utilities,
-            base_utilities, base_system, base_network,
-            vserver | AddPackages
-    ]).
-
-gentoo_vserver(vanilla, []).
-gentoo_vserver(backups, [vs_backup]).
-
 %amd64_hardened_vserver(Name, Packages, Dir) -->
 %    create_gentoo_builddir(amd64_hardened_nomulti, Dir),
 %    {dir_make_conf(Dir, Make_conf)},