--- wine-20050211.ebuild.orig	2005-02-23 18:53:43.000000000 +0000
+++ wine-20050211.ebuild	2005-02-23 21:38:19.000000000 +0000
@@ -26,7 +26,10 @@
 	gif? ( media-libs/libungif )
 	jpeg? ( media-libs/jpeg )
 	glut? ( virtual/glut )
-	lcms? ( media-libs/lcms )"
+	lcms? ( media-libs/lcms )
+	amd64? ( X? app-emulation/emul-linux-x86-xlibs \
+		alsa? app-emulation/emul-linux-x86-soundlibs \
+		jack? app-emulation/emul-linux-x86-soundlibs )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	sys-devel/bison
@@ -34,6 +37,15 @@
 	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
 	sys-devel/flex"
 
+pkg_setup() {
+	has_m32 || die "your compiler seems to be unable to compile 32bit code. if
+	you are on amd64, make sure you compile gcc with USE=multilib
+	FEATURES=-sandbox"
+	
+	ABI_ALLOW="x86"
+	ABI="x86"
+}
+	
 src_unpack() {
 	unpack Wine-${PV}.tar.gz
 	cd "${S}"
@@ -75,6 +87,17 @@
 		export DB2PS=true
 	fi
 
+	if use amd64; then
+		if [ -f /usr/lib32/libX11.so ]; then  
+			myconf="${myconf} --x-libraries=/usr/lib32"
+		elif [ -f /emul/linux/x86/usr/lib/libX11.so ]; then
+			myconf="${myconf} --x-libraries=/emul/linux/x86/usr/lib"
+		else
+			eerror "Couldn't find your 32bit X libs"
+			die "Couldn't find your 32bit X libs"
+		fi
+	fi
+	
 	#	$(use_enable amd64 win64)
 	# USE=debug is broken in this release
 	econf \
@@ -84,6 +107,7 @@
 		$(use_with X x) \
 		$(use_enable debug trace) \
 		$(use_enable debug) \
+		${myconf} \
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"
@@ -101,8 +125,8 @@
 		includedir="${D}"/usr/include/wine \
 		sysconfdir="${D}"/etc/wine \
 		mandir="${D}"/usr/share/man \
-		libdir="${D}"/usr/lib \
-		dlldir="${D}"/usr/lib/wine \
+		libdir="${D}"/usr/$(get_libdir) \
+		dlldir="${D}"/usr/$(get_libdir)/wine \
 		install || die
 	use doc && dodoc documentation/*.pdf