--- sys-libs/lib-compat/lib-compat-1.4.ebuild		2005-02-17 20:13:41.000000000 +0100
+++ sys-libs/lib-compat/lib-compat-1.4.ebuild.new	2005-03-08 12:16:37.000000000 +0100
@@ -2,19 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/lib-compat-1.4.ebuild,v 1.3 2005/02/17 18:49:17 plasmaroo Exp $
 
+inherit multilib
+
 DESCRIPTION="Compatibility C++ and libc5 and libc6 libraries for programs new and old"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~ia64"
+KEYWORDS="amd64 x86 ppc sparc alpha ~ia64"
 IUSE="sdl"
 
 RDEPEND="virtual/libc
 	sdl? ( media-libs/libsdl )"
 
-S=${WORKDIR}/${P}/${ARCH}
+( use amd64 || S=${WORKDIR}/${P}/${ARCH} ) && S=${WORKDIR}/${P}/x86
 
 src_unpack() {
 	unpack ${A}
@@ -31,7 +33,22 @@
 }
 
 src_install() {
-	if use x86 ; then
+	# if we have pre 2005.0 profile on amd64 do nothing
+	# since this compatibility libraries are provided
+	# by emul-linux-x86-compat package
+	if ( use amd64 && has_multilib_profile ) || -n use amd64; then
+		local OABI=${ABI}
+		if use amd64; then
+			ABI="x86"
+		fi
+		src_install-multi
+		ABI=${OABI}
+		unset OABI
+	fi
+}
+
+src_install-multi() {
+	if use x86 || use amd64 ; then
 		into /
 		dolib.so ld-linux.so.1*
 		rm -f ld-linux.so.1*