--- /usr/portage/sys-libs/pwdb/pwdb-0.62.ebuild.orig	2005-03-03 16:11:16.358425491 +0100
+++ /usr/portage/sys-libs/pwdb/pwdb-0.62.ebuild	2005-03-03 16:27:11.236705297 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.19 2005/01/04 04:18:05 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Password database"
 HOMEPAGE="http://packages.gentoo.org/ebuilds/?pwdb-${PVR}"
@@ -14,7 +14,8 @@
 IUSE="selinux"
 
 DEPEND="virtual/libc
-	selinux? ( sys-libs/libselinux )"
+	selinux? ( sys-libs/libselinux )
+	!app-emulation/emul-linux-x86-baselibs"
 
 src_unpack () {
 	unpack ${A}
@@ -30,9 +31,37 @@
 		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
 		Makefile
 	sed -i -e "s/=gcc/=$(tc-getCC)/g" default.defs
+	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 OS=${S}
+		local OPWD=$PWD
+		ABI="x86"
+		S=${OS}-x86
+		cd ${S}
+		src_compile-multilib
+		ABI="amd64"
+		S=${OS}-amd64
+		cd ${S}
+		src_compile-multilib
+		S=${OS}
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OPWD
+		unset OS
+		unset OABI
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
 	filter-flags -fstack-protector
 
 	# author has specified application to be compiled with `-g` 
@@ -44,16 +73,43 @@
 }
 
 src_install() {
-	dodir /lib /usr/include/pwdb
+	if use amd64 && has_multilib_profile; then
+		local OPWD=$PWD
+		cd ${S}-x86
+		dodir /lib32 /usr/include/pwdb
+		make \
+			INCLUDED=${D}/usr/include/pwdb \
+			LIBDIR=${D}/lib32 \
+			LDCONFIG="echo" \
+			install || die
+		preplib /
+		dodir /usr/lib32
+		mv ${D}/lib32/*.a ${D}/usr/lib32
+		local OABI=${ABI}
+		ABI="x86"
+		gen_usr_ldscript libpwdb.so
+		ABI=${OABI}
+		unset OABI
+		cd ${S}-amd64
+		src_install-multilib 64
+		cd ${OPWD}
+		unset OPWD
+	else
+		src_install-multilib
+	fi
+}
+
+src_install-multilib() {
+	dodir /lib${1} /usr/include/pwdb
 	make \
 		INCLUDED=${D}/usr/include/pwdb \
-		LIBDIR=${D}/lib \
+		LIBDIR=${D}/lib${1} \
 		LDCONFIG="echo" \
 		install || die
 
 	preplib /
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
+	dodir /usr/lib${1}
+	mv ${D}/lib${1}/*.a ${D}/usr/lib${1}
 
 	# See bug $4411 for more info
 	gen_usr_ldscript libpwdb.so