From e28fcda12209c5239d078b95e40e2e74927a2b03 Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Sat, 28 Feb 2015 22:20:50 +0000
Subject: [PATCH] Fix package.* files installation to work with new stage3's

The new (2015-02) stage3 tarballs use package.* directories instead of
files, causing the files to fail to be copied over.  This change instead
copies them to the directories, creating them if they don't already exist.
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index db87e40..325970a 100644
--- a/Makefile
+++ b/Makefile
@@ -164,10 +164,11 @@ $(COMPILE_OPTIONS): $(STAGE3) $(PORTAGE_DIR) configs/make.conf.$(ARCH) configs/l
 	$(inroot) eselect profile set 1
 	cp configs/locale.gen $(CHROOT)/etc/locale.gen
 	$(inroot) locale-gen
-	mkdir -p $(CHROOT)/etc/portage
-ifdef PACKAGE_FILES
-	cp $(PACKAGE_FILES) $(CHROOT)/etc/portage/
-endif
+	for f in $(PACKAGE_FILES); do \
+		base=`basename $$f` ; \
+		mkdir -p $(CHROOT)/etc/portage/$$base; \
+		cp $$f $(CHROOT)/etc/portage/$$base/virtual-appliance-$$base; \
+	done
 	touch $(COMPILE_OPTIONS)
 
 $(KERNEL): $(COMPILE_OPTIONS) $(KERNEL_CONFIG) scripts/kernel.sh