--- /usr/sbin/crossdev.orig	2008-12-07 15:02:21.578749000 +0100
+++ /usr/sbin/crossdev	2008-12-08 20:10:02.083810401 +0100
@@ -563,15 +563,6 @@
 set_portage dev-util insight
 
 #################
-emerged_with_use() {
-	local pkg=$1 use=$2
-	grep -qs ${use} /var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
-}
-set_eopts_on_pkg_status() {
-	emerged_with_use "$@" \
-		&& EOPTS=${EOPTS_DEF} \
-		|| EOPTS=${EOPTS_UP}
-}
 doemerge() {
 	[[ $1 == "[none]" ]] && return 0
 
@@ -598,9 +589,7 @@
 }
 
 # we include the '-u' so that we don't re-emerge packages
-EOPTS_DEF="${UOPTS} --nodeps --oneshot"
-EOPTS_UP="${EOPTS_DEF} -u"
-EOPTS=${EOPTS_UP}
+EOPTS="${UOPTS} --nodeps --oneshot -u --newuse"
 # keep things like --ask from screwing us up
 export EMERGE_DEFAULT_OPTS=""
 
@@ -629,29 +618,24 @@
 USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="headers-only" \
 	doemerge ${LPKG} ${LPKG}-headers
 fi
-USE="${GUSE} ${USE} ${GUSE_DISABLE}" CROSSCOMPILE_OPTS="bootstrap" \
+USE="${GUSE} ${USE} ${GUSE_DISABLE}" \
 	doemerge ${GPKG} ${GPKG}-stage1
 
 is_s2 || exit 0
-set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only
 USE="${KUSE} ${USE}" CROSSCOMPILE_OPTS="" \
 	doemerge ${KPKG}
 
 is_s3 || exit 0
 [[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc"
-set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only
 USE="${LUSE} ${USE}" CROSSCOMPILE_OPTS="" \
 	doemerge ${LPKG}
 
 is_s4 || exit 0
-set_eopts_on_pkg_status ${GPKG} crosscompile_opts_bootstrap
-EOPTS="${EOPTS_UP} --newuse"
 USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \
 	doemerge ${GPKG} ${GPKG}-stage2
 
 }
 
-EOPTS="${EOPTS_UP} --newuse"
 ex_gcc && USE="${GUSE} ${USE}" doemerge ${GPKG} ${GPKG}-extra
 ex_gdb && doemerge gdb
 ex_insight && doemerge insight