--- /usr/lib/portage/bin/ebuild.sh      2007-03-09 18:25:04.000000000 -0500
+++ ebuild.sh   2007-05-14 15:03:05.000000000 -0400
@@ -588,11 +588,11 @@
                CONF_LIBDIR="${!LIBDIR_VAR}"
        fi
        unset LIBDIR_VAR
+
+       local EI_DESTLIBDIR=""
        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}"
-               unset EI_DESTLIBDIR
+               EI_DESTLIBDIR="libdir=$(strip_duplicate_slashes ${EI_DESTLIBDIR})"
        fi
 
        if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
@@ -603,6 +603,7 @@
                                localstatedir="${D}/var/lib" \
                                mandir="${D}/usr/share/man" \
                                sysconfdir="${D}/etc" \
+                               ${EI_DESTLIBDIR} \
                                ${EXTRA_EINSTALL} \
                                "$@" install
                fi
@@ -612,6 +613,7 @@
                        localstatedir="${D}/var/lib" \
                        mandir="${D}/usr/share/man" \
                        sysconfdir="${D}/etc" \
+                       ${EI_DESTLIBDIR} \
                        ${EXTRA_EINSTALL} \
                        "$@" install || die "einstall failed"
        else