Added patch from Andrew Gaffney <agaffney@gentoo.org> to remove all instances of...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1187 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 49bb7c6e0aa11e6caa3ba9be8c02fa5f5620bf38..e6cab7b479e274f79a1fb918eb49a4b0771f307c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $
 
+  22 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/netboot/netboot-chroot.sh, targets/netboot2/netboot2-pkg.sh,
+  targets/stage4/stage4-chroot.sh, targets/tinderbox/tinderbox-chroot.sh:
+  Added patch from Andrew Gaffney <agaffney@gentoo.org> to remove all
+  instances of USE_ORDER since auto hasn't been valid for some time. This is
+  wrt bug #155864.
+
   22 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py, modules/stage1_target.py:
   Added patch from Daniel Ostrow <dostrow@gentoo.org> for added FreeBSD

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 6a2838569e6a96167f853fb675cc31aa293cedb0..3b5e34d6782ba53dafc0a027e5e1ada683975be8 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -14,9 +14,6 @@ export FEATURES="${clst_myfeatures}"
 ## START BUILD
 setup_portage
 
-# Turn off auto-use:
-export USE_ORDER="env:pkg:conf:defaults"
-
 unset DISTDIR
 
 # Don't grab MS core fonts, etc.

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 1531c297c7931b0d7ebd57790685d6362994854b..2c322748633a3bcb71cd2a4de1bad730255f93d6 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -15,8 +15,6 @@ export FEATURES="${clst_myfeatures}"
 ## START BUILD
 setup_portage
 
-# Turn off auto-use:
-export USE_ORDER="env:pkg:conf:defaults"       
 export USE="${clst_use}"
 
 run_emerge "${clst_packages}"

diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
index b4fcf36258a46e38ef10cea78179de566b718e41..afb21f006508f3367df991aa7d61fdff3a9ba51e 100755 (executable)
--- a/targets/netboot/netboot-chroot.sh
+++ b/targets/netboot/netboot-chroot.sh
@@ -10,7 +10,6 @@ setup_myemergeopts
 
 # Setup our environment
 export FEATURES="${clst_myfeatures}"
-export USE_ORDER="env:pkg:conf:defaults"
 
 # START BUILD
 

diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
index 5c25e012c7ab47fa17c01874bfad1d44bf62d3ee..d0cc40be60f0afc7775bc31b3b06e44bfd9415d3 100644 (file)
--- a/targets/netboot2/netboot2-pkg.sh
+++ b/targets/netboot2/netboot2-pkg.sh
@@ -10,7 +10,6 @@ setup_myemergeopts
 
 # Setup our environment
 export FEATURES="${clst_myfeatures}"
-export USE_ORDER="env:pkg:conf:defaults"
 
 # START BUILD
 

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 024f4c3b47da1654bf6de67f1110374449bb2888..4fc393c7af04b1b201fbf475c4eec60f58903f7f 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -12,8 +12,6 @@ export FEATURES="${clst_myfeatures}"
 
 ## START BUILD
 setup_portage
-# Turn off auto-use:
-export USE_ORDER="env:pkg:conf:defaults"       
 
 echo "Bringing system up to date using profile specific use flags"
 export USE="${USE} ${clst_HOSTUSE}"

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 7aba02a6bd970ad6edfe8c516a1dda5f161e7de8..7972767a8036c5f3cdd487a6e04204ae0cb2bea1 100755 (executable)
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -13,8 +13,6 @@ export FEATURES="${clst_myfeatures}"
 # START THE BUILD
 setup_portage
 
-# Turn off auto-use:
-export USE_ORDER="env:pkg:conf:defaults"       
 # Backup pristine system
 
 rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \