--- sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild	2005-03-08 13:57:24.000000000 +0100
+++ sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild.new	2005-03-08 13:57:17.000000000 +0100
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.11 2005/02/07 08:25:28 corsair Exp $
 
-inherit eutils flag-o-matic libtool gnuconfig versionator
+inherit eutils flag-o-matic libtool gnuconfig versionator multilib
 
 transform_known_flags() {
 	declare setting
@@ -147,7 +147,8 @@
 	>=sys-devel/gcc-config-1.3.1
 	>=sys-devel/gcc-3.3.3_pre20040130
 	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
+	          nls? ( sys-devel/gettext ) )
+	!<app-emulation/emul-linux-x86-compat-1000"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
@@ -185,7 +186,7 @@
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
 
-	use amd64 && myconf="${myconf} --disable-multilib"
+	use amd64 && ! has_multilib_profile && myconf="${myconf} --disable-multilib"
 
 	do_filter_flags
 	einfo "CFLAGS=\"${CFLAGS}\""
@@ -271,16 +272,18 @@
 	# other than the normal versioned directory, so that it doesnt conflict
 	# with gcc 3.3.3
 	mkdir -p ${D}/${LOC}/lib/libstdc++-v3/
+	use amd64 && has_multilib_profile && mkdir -p ${D}/${LOC}/lib32/libstdc++-v3/
 	mv ${D}/${LIBPATH}/lib* ${D}/${LOC}/lib/libstdc++-v3/
+	use amd64 && has_multilib_profile && mv ${D}/${LIBPATH}/32/lib* ${D}/${LOC}/lib32/libstdc++-v3/
 	# we dont want the headers...
-	rm -rf ${D}/${LOC}/lib/gcc*
+	rm -rf ${D}/${LOC}/lib{,32}/gcc*
 	# or locales...
 	rm -rf ${D}/${LOC}/share
 	# or anything other than the .so files, really.
 	find ${D} | grep -e c++.la$ -e c++.a$ | xargs rm -f
 	# we dont even want the un-versioned .so symlink, as it confuses some
 	# apps and also causes others to link against the old libstdc++...
-	rm ${D}/${LOC}/lib/libstdc++-v3/libstdc++.so
+	rm -f ${D}/${LOC}/lib{,32}/libstdc++-v3/libstdc++.so
 
 	# and it's much easier to just move around the result than it is to
 	# configure libstdc++-v3 to use CONF_LIDIR
@@ -289,5 +292,7 @@
 	fi
 
 	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=\"${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
+	local l32
+	use amd64 && has_multilib_profile && l32="${LOC}/lib32/libstdc++-v3/:"
+	echo "LDPATH=\"${l32}${LOC}/lib/libstdc++-v3/\"" >> ${D}/etc/env.d/99libstdc++
 }