--- /usr/portage/sys-libs/zlib/zlib-1.2.2.ebuild.orig	2005-03-02 14:07:15.581116282 +0100
+++ /usr/portage/sys-libs/zlib/zlib-1.2.2.ebuild	2005-03-02 14:21:41.933598440 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.2.ebuild,v 1.11 2005/02/17 16:42:40 lu_zero Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.gzip.org/zlib/"
@@ -16,6 +16,9 @@
 
 RDEPEND="virtual/libc"
 
+DEPEND="${RDEPEND}
+		!app-emulation/emul-linux-x86-baselibs"
+
 pkg_setup() {
 	tc-export CC RANLIB
 	export AR="$(tc-getAR) rc"
@@ -35,14 +38,56 @@
 	epatch ${FILESDIR}/${PN}-1.2.1-configure.patch
 	# fix shared library test on -fPIC dependant archs
 	epatch ${FILESDIR}/${PN}-1.2.1-fPIC.patch
+	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
+		cd ${OPWD}
+		ABI=${OABI}
+		unset OABI
+		unset OPWD
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
 	./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
 	emake || die
 }
 
 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
+		cd ${OPWD}
+		ABI=${OABI}
+		unset OABI
+		unset OPWD
+	else
+		src_install-multilib
+	fi
+}
+
+src_install-multilib() {
 	einstall libdir=${D}/$(get_libdir) || die
 	rm "${D}"/$(get_libdir)/libz.a
 	insinto /usr/include