--- /usr/portage/media-libs/jasper/jasper-1.900.1-r6.ebuild	2013-08-28 17:01:22.000000000 +0200
+++ /usr/portage/media-libs/jasper/jasper-1.900.1-r6.ebuild	2013-10-17 15:41:46.000000000 +0200
@@ -20,16 +20,25 @@ 
 RDEPEND="
 	jpeg? (
 		virtual/jpeg:0
-		amd64? (
-			abi_x86_32? ( app-emulation/emul-linux-x86-baselibs )
+		amd64? ( abi_x86_32? ( 
+			|| (
+				virtual/jpeg:0[abi_x86_32(-)]
+				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 			)
-		)
+		) )
+	)
 	opengl? (
 		virtual/opengl media-libs/freeglut
-		amd64? (
-			abi_x86_32? ( app-emulation/emul-linux-x86-opengl )
+		amd64? ( abi_x86_32? ( 
+			|| (
+				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+				(
+					virtual/opengl[abi_x86_32(-)]
+					media-libs/freeglut[abi_x86_32(-)]
+				)
 			)
-		)"
+		) )
+	)"
 DEPEND="${RDEPEND}
 	app-arch/unzip"