--- /usr/portage/net-misc/teamviewer/teamviewer-8.0.20931.ebuild	2013-09-21 21:52:20.000000000 +0200
+++ /media/public/overlays/local/net-misc/teamviewer/teamviewer-8.0.20931-r1.ebuild	2013-10-22 20:46:15.524223364 +0200
@@ -23,32 +23,48 @@
 RDEPEND="
 	app-shells/bash
 	x11-misc/xdg-utils
-	!system-wine? (
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs
-			app-emulation/emul-linux-x86-soundlibs
-			|| (
-				(
+
+	amd64? (
+		|| (
+			app-emulation/emul-linux-x86-xlibs[-abi_86_32]
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXau[abi_x86_32]
+				x11-libs/libXdamage[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXfixes[abi_x86_32]
+				x11-libs/libXtst[abi_x86_32]
+				!system-wine? (
+					media-libs/freetype[abi_x86_32]
 					x11-libs/libSM[abi_x86_32]
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXau[abi_x86_32]
-					x11-libs/libXdamage[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXfixes[abi_x86_32]
-					x11-libs/libXtst[abi_x86_32]
+					x11-libs/libXrender[abi_x86_32]
 				)
-				app-emulation/emul-linux-x86-xlibs
 			)
 		)
-		x86? (
+		!system-wine? (
+			|| (
+				sys-libs/zlib[abi_x86_32]
+				app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+			)
+			|| (
+				media-libs/alsa-lib[abi_x86_32]
+				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+			)
+		)
+	)
+	x86? (
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXtst
+		!system-wine? (
 			sys-libs/zlib
+			media-libs/alsa-lib
+			media-libs/freetype
 			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXtst
+			x11-libs/libXrender
 		)
 	)
 	system-wine? ( app-emulation/wine )"