Bring build steps in line with desktop-amd64-uclibc-hardened.

build

@@ -14,6 +14,13 @@ log stamp
 populate 2
 runscript cycle.2.sh
 
+log stamp
+log CYCLE_3
+log stamp
+
+populate 3
+runscript cycle.3.sh
+
 log stamp
 log Configure+Cleanup+Kernel
 log stamp
@@ -36,8 +43,8 @@ hashit
 +log stamp
 +
 +mount
-+populate 3
-+runscript cycle.2.sh
++populate 4
++runscript cycle.3.sh
 +unmount
 +
 +log stamp

core/var/lib/portage/world.CYCLE.1

@@ -1,64 +0,0 @@
-app-admin/sudo
-app-admin/syslog-ng
-app-arch/file-roller
-app-editors/gedit
-app-editors/nano
-app-editors/vim
-app-office/abiword
-app-portage/gentoolkit
-app-portage/layman
-app-text/evince
-app-text/tree
-dev-lang/python
-dev-lang/tcl
-dev-libs/gmp
-dev-util/strace
-dev-vcs/git
-gnome-extra/gnome-system-monitor
-mail-client/claws-mail
-mail-client/nail
-mail-mta/postfix
-media-gfx/eog
-media-gfx/gimp
-media-sound/alsa-utils
-media-video/smplayer
-net-analyzer/tcpdump
-net-dns/avahi
-net-dns/bind-tools
-net-fs/samba
-net-ftp/lftp
-net-irc/hexchat
-net-mail/dovecot
-net-misc/openntpd
-net-misc/rdate
-net-misc/tor
-net-misc/vinagre
-net-p2p/transmission
-net-wireless/wpa_supplicant
-sys-apps/dbus
-sys-apps/elfix
-sys-apps/gradm
-sys-apps/less
-sys-apps/paxctl
-sys-apps/pciutils
-sys-boot/lilo
-sys-devel/gdb
-sys-fs/cryptsetup
-sys-kernel/genkernel
-sys-kernel/linux-firmware
-sys-libs/cracklib
-sys-libs/db
-sys-libs/gdbm
-sys-process/lsof
-www-client/midori
-x11-base/xorg-server
-x11-libs/gksu
-x11-misc/slim
-x11-terms/xfce4-terminal
-x11-terms/xterm
-xfce-base/xfce4-appfinder
-xfce-base/xfce4-meta
-xfce-extra/thunar-archive-plugin
-xfce-extra/thunar-shares-plugin
-xfce-extra/xfce4-mixer
-xfce-extra/xfce4-volumed

core/var/lib/portage/world.CYCLE.2

@@ -5,7 +5,6 @@ app-editors/gedit
 app-editors/nano
 app-editors/vim
 app-office/abiword
-app-office/gnumeric
 app-portage/gentoolkit
 app-portage/layman
 app-text/evince
@@ -50,7 +49,6 @@ sys-kernel/linux-firmware
 sys-libs/cracklib
 sys-libs/db
 sys-libs/gdbm
-sys-process/fcron
 sys-process/lsof
 www-client/midori
 x11-base/xorg-server

scripts/cycle.1.sh

@@ -1,11 +1,13 @@
 #!/bin/bash -e
 
-source /etc/profile
-env-update
-emerge -b1q portage
-emerge -b1q =app-portage/grs-9999
-emerge --unmerge sys-fs/udev
-emerge -b1q sys-fs/eudev
-install-worldconf
-emerge -bevq --keep-going --with-bdeps=y @world
-clean-worldconf
+echo "Do nothing."
+
+# This is just here to sync up with the other desktops systems.
+# It just makes life easier when doing a 'git diff' between branches.
+# But if we were to do the same thing, it would be roughly this ...
+
+#source /etc/profile
+#env-update
+#emerge -b1q binutils
+#emerge -b1q gcc
+#emerge -b1q glibc

scripts/cycle.2.sh

@@ -2,7 +2,10 @@
 
 source /etc/profile
 env-update
+emerge -b1q portage
+emerge -b1q =app-portage/grs-9999
+emerge --unmerge sys-fs/udev
+emerge -b1q sys-fs/eudev
 install-worldconf
-emerge -buvNDq --keep-going --with-bdeps=y @world
+emerge -bevq --keep-going --with-bdeps=y @world
 clean-worldconf
-emerge -bq @preserved-rebuild

scripts/cycle.3.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+source /etc/profile
+env-update
+install-worldconf
+emerge -buvNDq --keep-going --with-bdeps=y @world
+clean-worldconf
+emerge -bq @preserved-rebuild