--- /usr/portage/media-libs/freetype/freetype-2.1.5-r1.ebuild.orig	2005-03-03 13:58:30.185788972 +0100
+++ /usr/portage/media-libs/freetype/freetype-2.1.5-r1.ebuild.orig	2005-03-03 14:01:03.848260613 +0100
@@ -2,7 +2,7 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.5-r1.ebuild,v 1.21 2005/01/17 03:28:35 vapier Exp $
 
-inherit eutils flag-o-matic gnuconfig libtool
+inherit eutils flag-o-matic gnuconfig libtool multilib
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="http://www.freetype.org/"
@@ -14,7 +14,8 @@ 
 IUSE="zlib bindist cjk doc"
 
 DEPEND="virtual/libc
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+	!app-emulation/emul-linux-x86-baselibs"
 
 src_unpack() {
 	local SPV="`echo ${PV} | cut -d. -f1,2`"
@@ -28,9 +29,33 @@ 
 	gnuconfig_update ${S}
 	uclibctoolize
 	epunt_cxx
+
+	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
+		cd ${OPWD}
+		ABI=${OABI}
+		unset OPWD
+		unset OABI
+	else
+		src_compile-multilib
+	fi
+}
+
+src_compile-multilib() {
 	use bindist || append-flags -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 	make setup CFG="--host=${CHOST} --prefix=/usr `use_with zlib` --libdir=/usr/$(get_libdir)" unix || die
@@ -46,6 +71,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
+		cd ${OPWD}
+		ABI=${OABI}
+		unset OPWD
+		unset OABI
+	else
+		src_install-multilib
+	fi
+}
+
+src_install-multilib() {
 	einstall libdir="${D}/usr/$(get_libdir)" || die
 
 	dodoc ChangeLog README