--- /usr/portage/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild.orig	2005-03-02 15:53:31.137057858 +0100
+++ /usr/portage/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild	2005-03-02 16:01:21.974374760 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild,v 1.11 2004/12/07 20:21:00 hardave Exp $
 
-inherit gnuconfig flag-o-matic eutils libtool
+inherit gnuconfig flag-o-matic eutils libtool multilib
 
 DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
 HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
@@ -14,7 +14,8 @@
 IUSE="berkdb"
 
 DEPEND="virtual/libc
-	berkdb? ( =sys-libs/db-1* )"
+	berkdb? ( =sys-libs/db-1* )
+	!app-emulation/emul-linux-x86-baselibs"
 RDEPEND="virtual/libc"
 
 src_unpack() {
@@ -23,15 +24,57 @@
 	gnuconfig_update
 	append-flags -fomit-frame-pointer
 	uclibctoolize
+	if use amd64 && has_multilib_profile; then
+		cp -ar ${S} ${S}-x86
+		mv ${S} ${S}-amd64
+	fi
 }
 
 src_compile() {
-	econf || die
+	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() {
+	econf ${1} || die
 	use berkdb || sed -i '/HAVE_LIBNDBM/s:.*::' autoconf.h
 	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
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OABI
+		unset OPWD
+	else
+		src_install-multilib
+	fi
+}
+
+src_install-multilib() {
 	make INSTALL_ROOT=${D} install || die
 
 	make \