=== modified file 'bin/ebuild.sh'
--- bin/ebuild.sh	
+++ bin/ebuild.sh	
@@ -1491,6 +1491,20 @@
 
 unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
 
+#update IUSE with USE_EXPAND variables
+for EXP_VAR in ${!IUSE_*}; do
+	EXP_VAR_PREFIX="$(echo ${EXP_VAR/IUSE_/} | tr '[A-Z]' '[a-z]')_"
+	for EXP_VAR_VAL in ${!EXP_VAR}; do
+		if [[ ${EXP_VAR_VAL} == ${EXP_VAR_PREFIX}* ]]; then
+			IUSE="${IUSE} ${EXP_VAR_VAL}"
+		else
+			IUSE="${IUSE} ${EXP_VAR_PREFIX}${EXP_VAR_VAL}"
+		fi
+	done
+done
+
+unset 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