=== modified file 'stagebuilder.pl'
--- stagebuilder.pl	2012-03-09 09:15:49 +0000
+++ stagebuilder.pl	2012-03-01 22:00:47 +0000
@@ -599,6 +599,22 @@
         ]),
     gentoo_build_stage4(atom_testing_eeepc, Dir).
 
+target(k8_testing_x11, Dir) -->
+    create_gentoo_builddir(i686, Dir),
+    {dir_make_conf(Dir, Make_conf)},
+    reset_make_conf(Dir, '-O2 -march=i686 -mcpu=k8 -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(k8_testing_x11, Dir).
+
 target(amd64_hardened_vshost, Dir) -->
     create_gentoo_builddir(amd64_hardened, Dir),
     {dir_make_conf(Dir, Make_conf)},
@@ -616,43 +632,6 @@
 target(amd64_vserver_base, Dir) -->
     amd64_hardened_vserver(amd64_vserver_base, [], Dir).
 
-target(Name, Dir) -->
-    create_gentoo_builddir(StageName, Dir),
-    {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).
-
-appendn(Start, End, Whole) :-
-    name(Start, StartS),
-    name(End, EndS),
-    append(StartS, EndS, WholeS),
-    name(Whole, WholeS).
-
-target_gentoo(k8_x11, i686, Dir, AddCommands) -->
-    reset_make_conf(Dir, '-O2 -march=i686 -mcpu=k8 -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,
-            base_utilities, base_system, base_network,
-            network_utilities, filesystem_utilities,
-            base_x11, base_media
-        ]).
-
 amd64_hardened_vserver(Name, Packages, Dir) -->
     create_gentoo_builddir(amd64_hardened_nomulti, Dir),
     {dir_make_conf(Dir, Make_conf)},