--- /usr/portage/app-arch/bzip2/bzip2-1.0.2-r5.ebuild.orig	2005-03-02 15:10:31.875622314 +0100
+++ /usr/portage/app-arch/bzip2/bzip2-1.0.2-r5.ebuild	2005-03-02 15:29:54.186030152 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r5.ebuild,v 1.1 2005/02/19 18:30:39 vapier Exp $
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="http://sources.redhat.com/bzip2/"
@@ -13,7 +13,8 @@
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="build static"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+		!app-emulation/emul-linux-x86-baselibs"
 
 src_unpack() {
 	unpack ${A}
@@ -31,9 +32,32 @@
 	if [[ -x /bin/bzip2 ]] && tc-is-cross-compiler ; then
 		sed -i -e 's:./bzip2 -:bzip2 -:g' Makefile || die
 	fi
+	if use amd64 && has_multilib_profile; then
+		cp -ar ${S} ${S}-x86
+		mv ${S} ${S}-amd64
+	fi
 }
 
 src_compile() {
+	if use amd64 && has_multilib_profile; then
+		local OABI=${ABI}
+		local OPWD=$PWD
+		ABI="x86"
+		cd ${S}-x86
+		src_compile-multilib
+		ABI="amd64"
+		cd ${S}-amd64
+		src_compile-multilib
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OABI
+		unset OPWD
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
 	local makeopts="
 		CC=$(tc-getCC)
 		AR=$(tc-getAR)
@@ -46,6 +70,29 @@
 }
 
 src_install() {
+	if use amd64 && has_multilib_profile; then
+		local OABI=${ABI}
+		local OPWD=$PWD
+		ABI="x86"
+		cd ${S}-x86
+		CONF_LIBDIR=lib32
+		src_install-multilib ${S}-x86
+		# remove x86 binaries
+		rm -rf ${D}/bin
+		ABI="amd64"
+		cd ${S}-amd64
+		CONF_LIBDIR=lib64
+		src_install-multilib ${S}-amd64
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OABI
+		unset OPWD
+	else
+		src_install-multilib ${S}
+	fi
+}
+
+src_install-multilib() {
 	if ! use build ; then
 		make PREFIX="${D}"/usr install || die
 		mv "${D}"/usr/bin "${D}"
@@ -60,7 +107,7 @@
 
 		[[ -z ${CONF_LIBDIR} ]] && CONF_LIBDIR="lib"
 		[[ ${CONF_LIBDIR} != "lib" ]] && mv ${D}/usr/lib ${D}/usr/${CONF_LIBDIR}
-		dolib.so "${S}"/libbz2.so.${PV}
+		dolib.so "${1}"/libbz2.so.${PV}
 		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1.0
 		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so
 		dosym libbz2.so.${PV} /usr/${CONF_LIBDIR}/libbz2.so.1