=== modified file 'stagebuilder.prolog'
--- stagebuilder.prolog	2011-11-26 08:33:57 +0000
+++ stagebuilder.prolog	2011-11-25 17:27:50 +0000
@@ -236,8 +236,8 @@
     setof(Lines , maplist(format_cmd, [Command], Lines), Solutions),
     maplist(print_solution, Solutions).
 
- cmds_repr(Commands) :-
-     maplist(cmd_repr, Commands).
+% cmds_repr(Commands) :-
+%     maplist(cmd_repr, Commands).
 
 flat_cmds(X, List) :-
     (  is_list(X)
@@ -313,91 +313,63 @@
 % Gentoo Packages
 %
 
-gentoo_package(portage22, [
-        package_keywords('sys-apps/portage **'),
-        package_mask('=sys-apps/portage-9999')
-    ]).
-gentoo_package(nopy3k, [
-        package_mask('>=dev-lang/python-3'),
-        package_mask('net-zope/zope-fixers')
-    ]).
-gentoo_package(mc, [
-        package_use('app-misc/mc slang -ncurses'),
-        package_world('app-misc/mc')
-    ]).
-gentoo_package(portage_utilities, [
-        package_world('ccx-meta/portage-utilities')
-    ]).
+gentoo_package(portage22
+              ,[package_keywords('sys-apps/portage **')
+               ,package_mask('=sys-apps/portage-9999')
+               ]).
+gentoo_package(nopy3k
+               ,[package_mask('>=dev-lang/python-3')
+               ,package_mask('net-zope/zope-fixers')
+               ]).
+gentoo_package(mc
+              ,[package_use('app-misc/mc slang -ncurses')
+               ,package_world('app-misc/mc')
+               ]).
+gentoo_package(portage_utilities
+              ,[package_world('ccx-meta/portage-utilities')
+               ]).
 
-gentoo_package(vim, [
-        package_world('app-editors/vim')
-    ], [
-        'vim', 'vim-pager', 'vim-syntax'
-    ]).
-gentoo_package(zsh, [
-        package_world('app-shells/zsh'),
-        package_world('app-shells/zsh-completion')
-    ], [
-        'zsh-completion'
-    ]).
-gentoo_package(base_utilities, [
-        package_world('ccx-meta/base-utilities')
-    ], [
-        'zsh-completion', unicode
-    ]).
-gentoo_package(base_system, [
-        package_world('ccx-meta/base-system')
-    ], [
-        caps, xattrs, acl
-    ]).
-gentoo_package(base_network, [
-        package_world('ccx-meta/base-network')
-    ], [
-        ipv6
-    ]).
-gentoo_package(base_x11, [
-        package_world('ccx-meta/base-x11')
-    ], [
-        256-color, 'X', apng, cairo, exif, gif, gstreamer, gtk, imlib, jpeg,
-        opengl, png, sdl, sdl-image, tcl, tk, tiff, truetype, webkit, xcb, xpm
-    ]).
-gentoo_package(filesystem_utilities, [
-        package_world('ccx-meta/filesystem-utilities')
-    ], [
-        'device-mapper', xfs
-    ]).
-gentoo_package(network_utilities, [
-        package_world('ccx-meta/network-utilities'),
-        package_use('net-analyzer/tcpdump -samba')
-    ], [
-        ssl,ipv6
-    ]).
-gentoo_package(vserver_init, [
-        package_world('sys-cluster/vserver-init')
-    ], [
-        vserver
-    ]).
-gentoo_package(amd64_optimize, [], [
-        mmx, sse, sse2, sse3, ssse3
-    ]).
+gentoo_package(vim
+              ,[package_world('app-editors/vim')
+               ]
+              ,['vim', 'vim-pager', 'vim-syntax']).
+gentoo_package(zsh
+              ,[package_world('app-shells/zsh')
+               ,package_world('app-shells/zsh-completion')
+               ]
+              ,['zsh-completion']).
+gentoo_package(base_utilities
+              ,[package_world('ccx-meta/base-utilities')
+               ]
+              ,['zsh-completion', unicode]).
+gentoo_package(base_system
+              ,[package_world('ccx-meta/base-system')
+               ]
+              ,[caps, xattrs, acl]).
+gentoo_package(base_network
+              ,[package_world('ccx-meta/base-network')
+               ]
+              ,[ipv6]).
+gentoo_package(filesystem_utilities
+              ,[package_world('ccx-meta/filesystem-utilities')
+               ]
+              ,['device-mapper', xfs]).
+gentoo_package(network_utilities
+              ,[package_world('ccx-meta/network-utilities')
+	       ,package_use('net-analyzer/tcpdump -samba')
+               ]
+              ,[ssl,ipv6]).
+gentoo_package(vserver_init
+              ,[package_world('sys-cluster/vserver-init')
+               ]
+              ,[vserver]).
 
 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(base_media, [
-        package_world('ccx-meta/base-media')
-    ], [
-        aac, alsa, asf, audiofile, avcodec, dv, dvd, encode, ffmpeg, flac,
-        gstreamer, mng, modplug, mp3, mpeg, ogg, sid, sox, speex, theora,
-        transcode, vorbis, x264, xanim, xine, xvid, xvmc
-    ], [
-        pulseaudio
-    ]).
+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).
@@ -416,7 +388,7 @@
     ord_union(PkgUseEnabled, AggUseEnabled, UseEnabled),
     ord_union(PkgUseDisabled, AggUseDisabled, UseDisabled).
 
-disabled_use(Use, +('-', Use)).
+disabled_use(Use, '-' + Use).
 
 format_package_use(Packages, JoinedUse) :-
     aggregate_package_use(Packages, UseEnabled, UseDisabled),
@@ -588,28 +560,12 @@
                    ,'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
-        ]),
-    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
-        ]),
+    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) -->