=== modified file 'conf/gentoo_scripts/rebuild_stage3.sh'
--- conf/gentoo_scripts/rebuild_stage3.sh	2012-03-23 03:41:50 +0000
+++ conf/gentoo_scripts/rebuild_stage3.sh	2012-03-21 11:03:33 +0000
@@ -24,7 +24,6 @@
 source /etc/profile && \
 emerge portage ccache python:2.7 && \
 eselect python set python2.7 && \
-emerge -1 openrc udev && \
 emerge -u gcc && \
 gcc-config `gcc-config -l | awk '{p=$2} END{print p}'` && \
 source /etc/profile && \

=== modified file 'stagebuilder.pl'
--- stagebuilder.pl	2012-03-23 03:41:50 +0000
+++ stagebuilder.pl	2012-03-23 00:58:38 +0000
@@ -196,6 +196,9 @@
 gentoo_package(development_utilities, [
     package_world('ccx-meta/development-utilities')
     ]).
+gentoo_package(net_clients, [
+    package_world('ccx-meta/net-clients')
+    ]).
 
 gentoo_package(vim, [
         package_world('app-editors/vim')
@@ -264,12 +267,6 @@
 gentoo_package(amd64_optimize, [], [
         mmx, sse, sse2, sse3, ssse3
     ]).
-gentoo_package(net_clients, [
-        package_world('ccx-meta/net-clients'),
-        package_use('net-libs/curl -threads -nss')
-    ], [
-        ares, curl, gnutls
-    ]).
 
 gentoo_package(Name, Echos, []) :- gentoo_package(Name, Echos).
 
@@ -279,8 +276,8 @@
         sse, sse2, sse3, ssse3
     ]).
 gentoo_package(nokit, [
-        package_mask('sys-auth/polkit'),
-        package_mask('sys-auth/consolekit')
+    package_mask('sys-auth/polkit'),
+    package_mask('sys-auth/consolekit')
     ], [], [
     policykit, consolekit, udisks, gdu
     ]).