--- /usr/portage/dev-libs/popt/popt-1.7-r1.ebuild.orig	2005-03-02 22:51:15.103470594 +0100
+++ /usr/portage/dev-libs/popt/popt-1.7-r1.ebuild.orig	2005-03-02 23:22:55.884046879 +0100
@@ -2,7 +2,7 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.7-r1.ebuild,v 1.19 2005/02/21 05:04:30 vapier Exp $
 
-inherit libtool eutils
+inherit libtool eutils multilib
 
 DESCRIPTION="Parse Options - Command line parser"
 HOMEPAGE="http://www.rpm.org/"
@@ -13,21 +13,64 @@ 
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
 IUSE="nls"
 
-DEPEND="nls? ( sys-devel/gettext )"
+DEPEND="nls? ( sys-devel/gettext )
+		!app-emulation/emul-linux-x86-baselibs"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	elibtoolize
 	use nls || touch ../rpm.c
+	if use amd64 && has_multilib_profile; then
+		cp -ar ${S} ${S}-x86
+		mv ${S} ${S}-amd64
+	fi
 }
 
 src_compile() {
-	econf $(use_enable nls) || 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} $(use_enable nls) || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die
+	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
 	dodoc CHANGES README
 }