--- ebuild.sh.orig	2006-05-28 16:37:48.000000000 +0900
+++ ebuild.sh.orig	2006-05-28 16:45:54.000000000 +0900
@@ -1491,6 +1491,17 @@ 
 
 unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
 
+#update IUSE with USE_EXPAND variables
+MY_USE_EXPAND="$(set | grep -E '^IUSE_' | sed 's/=.*//')"
+for EXP_VAR in ${MY_USE_EXPAND}; do
+	EXP_VAR_PREFIX="$(echo ${EXP_VAR/IUSE_/} | tr '[A-Z]' '[a-z]')_"
+	for EXP_VAR_VAL in ${!EXP_VAR}; do
+		IUSE="${IUSE} ${EXP_VAR_PREFIX}${EXP_VAR_VAL}"
+	done
+done
+
+unset MY_USE_EXPAND EXP_VAR EXP_VAR_PREFIX EXP_VAR_VAL
+
 if [ "${EBUILD_PHASE}" != "depend" ]; then
 	# Lock the dbkey variables after the global phase
 	declare -r DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE DESCRIPTION