--- /usr/portage/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild.orig	2005-03-02 18:13:49.422570949 +0100
+++ /usr/portage/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild	2005-03-02 18:28:03.504548388 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.35-r1.ebuild,v 1.17 2005/02/06 22:48:20 vapier Exp $
 
-inherit eutils flag-o-matic gnuconfig toolchain-funcs
+inherit eutils flag-o-matic gnuconfig toolchain-funcs multilib
 
 DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -17,7 +17,8 @@
 	diet? ( dev-libs/dietlibc )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
-	sys-apps/texinfo"
+	sys-apps/texinfo
+	!app-emulation/emul-linux-x86-baselibs"
 
 src_unpack() {
 	unpack ${A}
@@ -41,9 +42,33 @@
 		configure e2fsck/journal.c e2fsck/recovery.c \
 		e2fsck/unix.c lib/ext2fs/kernel-jbd.h \
 		|| die "sed jbd debug failed"
+
+	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 --libdir=/usr/lib32
+		ABI="amd64"
+		cd ${S}-amd64
+		src_compile-multilib --libdir=/usr/lib64
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OABI
+		unset OPWD
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
 	# building e2fsprogs on sparc results in silo breaking
 	[ "${ARCH}" = "sparc" ] && filter-flags -fstack-protector
 
@@ -56,7 +81,7 @@
 		&& myconf="${myconf} --with-ldopts=-static" \
 		|| myconf="${myconf} --enable-dynamic-e2fsck --enable-elf-shlibs"
 	use diet && myconf="${myconf} --with-diet-libc"
-	econf \
+	econf ${1} \
 		$(use_enable nls) \
 		${myconf} || die
 
@@ -65,6 +90,25 @@
 }
 
 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() {
 	make DESTDIR=${D} libdir=/zapme install || die
 	#evil e2fsprogs makefile -- I'll get you!
 	rm -rf ${D}/zapme