From 26dac946ac48362b03fb06d7523d81b6b9f7cc5e Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Sat, 6 Nov 2010 17:49:19 -0400
Subject: [PATCH] * Pre-emerge xz-utils as some packages need this to unpack

* Clean up Makefile a little
---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4301f2c..6b0dc49 100644
--- a/Makefile
+++ b/Makefile
@@ -140,13 +140,18 @@ grub: systools grub.conf $(CHROOT)/boot/vmlinuz
 
 software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
 	$(preinstall)
-	#chroot $(CHROOT) emerge -DN $(USEPKG) system
 	cp etc-update.conf $(CHROOT)/etc/
-	cat $(WORLD) >> $(CHROOT)/var/lib/portage/world
-	#chroot $(CHROOT) emerge -DNn $(USEPKG) `cat $(WORLD)`
-	chroot $(CHROOT) emerge $(USEPKG) --update --newuse --deep world
-	chroot $(CHROOT) emerge -1n app-portage/gentoolkit
+	
+	# some packages, like, tar need xz-utils to unpack, but it not part of
+	# the stage3 so may not be installed yet
+	chroot $(CHROOT) emerge -1n $(USEPKG) app-arch/xz-utils
+	
+	chroot $(CHROOT) emerge $(USEPKG) --update --newuse --deep `cat $(WORLD)`
+	
+	# Need gentoolkit to run revdep-rebuild
+	chroot $(CHROOT) emerge -1n $(USEPKG) app-portage/gentoolkit
 	chroot $(CHROOT) revdep-rebuild -i
+	
 	cp issue $(CHROOT)/etc/issue
 	chroot $(CHROOT) emerge --depclean --with-bdeps=n
 	chroot $(CHROOT) etc-update