--- /usr/portage/dev-libs/expat/expat-1.95.8.ebuild.orig	2005-03-02 18:02:01.216016472 +0100
+++ /usr/portage/dev-libs/expat/expat-1.95.8.ebuild	2005-03-02 18:09:09.449255548 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-1.95.8.ebuild,v 1.14 2005/02/21 04:55:59 vapier Exp $
 
-inherit libtool
+inherit libtool multilib
 
 DESCRIPTION="XML parsing libraries"
 HOMEPAGE="http://expat.sourceforge.net/"
@@ -14,13 +14,18 @@
 IUSE="test"
 
 DEPEND="virtual/libc
-	test? ( >=dev-libs/check-0.8 )"
+	test? ( >=dev-libs/check-0.8 )
+	!app-emulation/emul-linux-x86-baselibs"
 RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	uclibctoolize
+	if use amd64 && has_multilib_profile; then
+		cp -ar ${S} ${S}-x86
+		mv ${S} ${S}-amd64
+	fi
 }
 
 src_test() {
@@ -32,7 +37,50 @@
 	make check || die "make check failed"
 }
 
+src_compile() {
+	if use amd64 && has_multilib_profile; then
+		local OABI=${ABI}
+		local OPWD=$PWD
+		ABI="x86"
+		cd ${S}-x86
+		src_compile-multilib --libdir=${D}/usr/lib32
+		ABI="amd64"
+		cd ${S}-amd64
+		src_compile-multilib --libdir=${D}/usr/lib
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OABI
+		unset OPWD
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
+	econf ${1}
+	emake
+}
+
 src_install() {
+	if use amd64 && has_multilib_profile; then
+		local OABI=${ABI}
+		local OPWD=$PWD
+		ABI="x86"
+		cd ${S}-x86
+		src_install-multilib
+		ABI="amd64"
+		cd ${S}-amd64
+		src_install-multilib
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OABI
+		unset OPWD
+	else
+		src_install-multilib
+	fi
+}
+
+src_install-multilib() {
 	einstall man1dir="${D}/usr/share/man/man1" || die "einstall failed"
 	dosed /usr/$(get_libdir)/libexpat.la #81568
 	dodoc Changes README