--- wine-20050310.ebuild.orig	2005-03-13 13:00:04.000000000 +0200
+++ wine-20050310.ebuild	2005-03-14 03:06:14.000000000 +0200
@@ -27,14 +27,24 @@
 	jpeg? ( media-libs/jpeg )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-soundlibs
+	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-devel/bison
 	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
@@ -76,6 +86,19 @@
 		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"
+		elif [ -f /emul/linux/x86/usr/X11R6/lib/libX11.so ]; then
+			myconf="${myconf} --x-libraries=/emul/linux/x86/usr/X11R6/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 \
@@ -85,6 +108,7 @@
 		$(use_with X x) \
 		$(use_enable debug trace) \
 		$(use_enable debug) \
+		${myconf} \
 		|| die "configure failed"
 
 	emake -j1 depend || die "depend"