--- /usr/lib64/portage/bin/ebuild.sh	2007-05-14 22:10:09.000000000 -0400
+++ ebuild.sh	2007-05-14 22:15:13.000000000 -0400
@@ -583,6 +583,7 @@
 
 einstall() {
 	# CONF_PREFIX is only set if they didn't pass in libdir above.
+	local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}"
 	LIBDIR_VAR="LIBDIR_${ABI}"
 	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
 		CONF_LIBDIR="${!LIBDIR_VAR}"
@@ -591,7 +592,7 @@
 	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
 		EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}"
 		EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})"
-		EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${EXTRA_EINSTALL}"
+		LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}"
 		unset EI_DESTLIBDIR
 	fi
 
@@ -603,7 +604,7 @@
 				localstatedir="${D}/var/lib" \
 				mandir="${D}/usr/share/man" \
 				sysconfdir="${D}/etc" \
-				${EXTRA_EINSTALL} \
+				${LOCAL_EXTRA_EINSTALL} \
 				"$@" install
 		fi
 		make prefix="${D}/usr" \
@@ -612,7 +613,7 @@
 			localstatedir="${D}/var/lib" \
 			mandir="${D}/usr/share/man" \
 			sysconfdir="${D}/etc" \
-			${EXTRA_EINSTALL} \
+			${LOCAL_EXTRA_EINSTALL} \
 			"$@" install || die "einstall failed"
 	else
 		die "no Makefile found"