--- /usr/portage/sys-libs/db/db-4.1.25_p1-r4.ebuild.orig	2005-03-02 16:07:57.000000000 +0100
+++ /usr/portage/sys-libs/db/db-4.1.25_p1-r4.ebuild	2005-03-02 16:11:07.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.1.25_p1-r4.ebuild,v 1.17 2005/01/30 19:39:20 pauldv Exp $
 
-inherit eutils gnuconfig db
+inherit eutils gnuconfig db multilib
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -30,7 +30,8 @@
 IUSE="tcltk java doc nocxx bootstrap"
 
 DEPEND="tcltk? ( dev-lang/tcl )
-	java? ( virtual/jdk )"
+	java? ( virtual/jdk )
+	!app-emulation/emul-linux-x86-baselibs"
 RDEPEND="tcltk? ( dev-lang/tcl )
 	java? ( virtual/jre )"
 
@@ -48,9 +49,33 @@
 	epatch ${FILESDIR}/${PN}-4.1.25-java.patch
 
 	gnuconfig_update "${S}/../dist"
+
+	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() {
 	addwrite /proc/self/maps
 
 	local myconf=""
@@ -91,6 +116,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() {
 
 	einstall libdir="${D}/usr/$(get_libdir)" || die