=== modified file 'stagebuilder.pl'
--- stagebuilder.pl	2012-03-09 10:24:30 +0000
+++ stagebuilder.pl	2012-03-09 09:15:49 +0000
@@ -567,6 +567,37 @@
         ]),
     gentoo_build_stage4(amd64_testing, Dir).
 
+target(amd64_testing_x11, 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, vim, mc, nokit,
+            portage_utilities,
+            base_utilities, base_system, base_network,
+            network_utilities, filesystem_utilities,
+            base_x11, base_media
+        ]),
+    gentoo_build_stage4(amd64_testing_x11, Dir).
+
+target(atom_testing_eeepc, Dir) -->
+    create_gentoo_builddir(i686, Dir),
+    {dir_make_conf(Dir, Make_conf)},
+    reset_make_conf(Dir, '-Os -march=prescott -pipe -fomit-frame-pointer'
+                       , '${CFLAGS}', 'i686-pc-linux-gnu'),
+    [echo_append('ACCEPT_KEYWORDS="~x86"', 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,
+            base_x11, base_media
+        ]),
+    gentoo_build_stage4(atom_testing_eeepc, Dir).
 
 target(amd64_hardened_vshost, Dir) -->
     create_gentoo_builddir(amd64_hardened, Dir),
@@ -587,28 +618,21 @@
 
 target(Name, Dir) -->
     create_gentoo_builddir(StageName, Dir),
-    { dir_make_conf(Dir, Make_conf)
-    , site_conf_file('make.conf', Site_conf)
-    },
-    target_gentoo(BaseName, StageName, Dir, [
-        run_append([cat, Site_conf], Make_conf)
-    ]),
+    {gentoo_stage(StageName, ArchName, _)},
+    {dir_make_conf(Dir, Make_conf)},
+    target_gentoo(BaseName, StageName, Dir,
+        [echo_append('ACCEPT_KEYWORDS="~'+ArchName+'"', Make_conf)]
+    ),
+    {appendn(BaseName, '_testing', Name)},
+    %{Name = BaseName + '_testing'},
+    gentoo_build_stage4(Name, Dir).
+
+target(Name, Dir) -->
+    create_gentoo_builddir(StageName, Dir),
+    target_gentoo(BaseName, StageName, Dir, []),
     {appendn(BaseName, '_stable', Name)},
     gentoo_build_stage5(Name, Dir).
 
-target(Name, Dir) -->
-    create_gentoo_builddir(StageName, Dir),
-    { gentoo_stage(StageName, ArchName, _)
-    , dir_make_conf(Dir, Make_conf)
-    , site_conf_file('make.conf', Site_conf)
-    },
-    target_gentoo(BaseName, StageName, Dir, [
-        echo_append('ACCEPT_KEYWORDS="~'+ArchName+'"', Make_conf),
-        run_append([cat, Site_conf], Make_conf)
-    ]),
-    {appendn(BaseName, '_testing', Name)},
-    gentoo_build_stage4(Name, Dir).
-
 appendn(Start, End, Whole) :-
     name(Start, StartS),
     name(End, EndS),
@@ -619,30 +643,8 @@
     reset_make_conf(Dir, '-O2 -march=i686 -mcpu=k8 -pipe -fomit-frame-pointer'
                        , '${CFLAGS}', 'i686-pc-linux-gnu'),
     prepend(AddCommands),
-    configure_gentoo_packages(Dir ,[
-            portage22, nopy3k, vim, mc, nokit,
-            portage_utilities,
-            base_utilities, base_system, base_network,
-            network_utilities, filesystem_utilities,
-            base_x11, base_media
-        ]).
-
-target_gentoo(amd64_x11, amd64, Dir, AddCommands) -->
-    reset_make_conf(Dir, '-O2 -pipe', '${CFLAGS}'
-                   ,'amd64-pc-linux-gnu'),
-    prepend(AddCommands),
-    configure_gentoo_packages(Dir ,[
-            portage22, nopy3k, vim, mc, nokit,
-            portage_utilities,
-            base_utilities, base_system, base_network,
-            network_utilities, filesystem_utilities,
-            base_x11, base_media
-        ]).
-
-target_gentoo(atom_eeepc, i686, Dir, AddCommands) -->
-    reset_make_conf(Dir, '-Os -march=prescott -pipe -fomit-frame-pointer'
-                       , '${CFLAGS}', 'i686-pc-linux-gnu'),
-    prepend(AddCommands),
+    %[echo_append('ACCEPT_KEYWORDS="~x86"', Make_conf)],
+    append_site_make_conf(Dir),
     configure_gentoo_packages(Dir ,[
             portage22, nopy3k, vim, mc, nokit,
             portage_utilities,