crossdev: drop --nodeps --oneshot from default emerge options

URL: http://bugs.gentoo.org/246839
URL: http://bugs.gentoo.org/280079
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/crossdev b/crossdev
index e74d9f1..edcd6c5 100755
--- a/crossdev
+++ b/crossdev
@@ -612,8 +612,12 @@ doemerge() {
 	eend 0
 }
 
-# we include the '-u' so that we don't re-emerge packages
-EOPTS_DEF="${UOPTS} --nodeps --oneshot"
+# We include the '-u' so that we don't re-emerge packages.  Avoid
+# using --nodeps as packages have more host depends nowadays (like
+# gcc wanting updated mpfr/gmp).  Don't use --oneshot anymore to
+# follow normal emerge behavior; people can pass the -1 to portage
+# themselves if they want that.
+EOPTS_DEF="${UOPTS}"
 EOPTS_UP="${EOPTS_DEF} -u"
 EOPTS=${EOPTS_UP}
 # keep things like --ask from screwing us up