Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
--- toolchain.eclass	21 May 2014 21:30:26 -0000	1.630
+++ toolchain.eclass	29 May 2014 17:56:08 -0000
@@ -198,13 +198,41 @@ 
 		x11-proto/xextproto
 		=x11-libs/gtk+-2*
 		virtual/pkgconfig
-		amd64? ( multilib? (
-			app-emulation/emul-linux-x86-gtklibs
-			app-emulation/emul-linux-x86-xlibs
-		) )
 	"
 	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
 	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
+
+	case ${EAPI:-0} in
+		0|1|2|3)
+			GCJ_GTK_DEPS+="
+				amd64? ( multilib? (
+					app-emulation/emul-linux-x86-gtklibs
+					app-emulation/emul-linux-x86-xlibs
+				) )
+			"
+			;;
+		*)
+			GCJ_GTK_DEPS+="
+				amd64? ( multilib? (
+					|| (
+						app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+						x11-libs/gtk+:2[abi_x86_32(-)]
+					)
+					|| (
+						app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+						(
+							x11-libs/libXt[abi_x86_32(-)]
+							x11-libs/libX11[abi_x86_32(-)]
+							x11-libs/libXtst[abi_x86_32(-)]
+							x11-proto/xproto[abi_x86_32(-)]
+							x11-proto/xextproto[abi_x86_32(-)]
+						)
+					)
+				) )
+			"
+			;;
+	esac
+
 	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
 fi