Index: dolib
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/dolib,v
--- dolib	10 Oct 2004 10:07:20 -0000	1.8
+++ dolib	31 Dec 2004 11:13:26 -0000
@@ -5,2 +5,8 @@ 
 
+LIBDIR_VAR="LIBDIR_${ABI}"
+if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
+	CONF_LIBDIR="${!LIBDIR_VAR}"
+fi        
+unset LIBDIR_VAR
+
 if [ -z "${CONF_LIBDIR}" ]; then
Index: ebuild-functions.sh
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/ebuild-functions.sh,v
--- ebuild-functions.sh	9 Dec 2004 17:10:27 -0000	1.4
+++ ebuild-functions.sh	31 Dec 2004 11:13:26 -0000
@@ -90,3 +90,8 @@ econf() {
 		# if the ebuild passes in --libdir, they're responsible for the conf_libdir fun.
-		if [ ! -z "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then
+		LIBDIR_VAR="LIBDIR_${ABI}"
+		if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
+			CONF_LIBDIR="${!LIBDIR_VAR}"
+		fi
+		unset LIBDIR_VAR
+		if [ -n "${CONF_LIBDIR}" ] && [ "${*/--libdir}" == "$*" ]; then
 			if [ "${*/--prefix}" == "$*" ]; then
@@ -140,3 +145,8 @@ einstall() 
 	# CONF_PREFIX is only set if they didn't pass in libdir above
-	if [ ! -z "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
+	LIBDIR_VAR="LIBDIR_${ABI}"
+	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
+		CONF_LIBDIR="${!LIBDIR_VAR}"
+	fi
+	unset LIBDIR_VAR
+	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
 		EXTRA_EINSTALL="libdir=${D}/${CONF_PREFIX}/${CONF_LIBDIR} ${EXTRA_EINSTALL}"
Index: preplib
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/preplib,v
--- preplib	4 Oct 2004 13:56:50 -0000	1.7
+++ preplib	31 Dec 2004 11:13:26 -0000
@@ -5,2 +5,8 @@ 
 
+LIBDIR_VAR="LIBDIR_${ABI}"
+if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
+	CONF_LIBDIR="${!LIBDIR_VAR}"
+fi
+unset LIBDIR_VAR
+
 if [ -z "${CONF_LIBDIR}" ]; then