[QA] Remove emul-linux-x86-* from dependencies.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

7 files changed, 57 insertions, 97 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 14def0d2e61d..f7a48410d6c1 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.379 2015/06/01 16:09:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.380 2015/06/14 18:12:07 ulm Exp $
+
+  14 Jun 2015; Ulrich Müller <ulm@gentoo.org> ati-drivers-14.4_p1.ebuild,
+  ati-drivers-14.6_beta2.ebuild, ati-drivers-14.9-r2.ebuild,
+  ati-drivers-14.12-r2.ebuild, ati-drivers-14.12-r3.ebuild:
+  [QA] Remove emul-linux-x86-* from dependencies.
 
   01 Jun 2015; Michał Górny <mgorny@gentoo.org> -ati-drivers-13.12.ebuild,
   -ati-drivers-13.1_pre897.ebuild, -ati-drivers-13.4.ebuild,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 324f72edbdf0..3eaccf1f9864 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -19,30 +19,25 @@ DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836
 DIST fglrx-installer_15.200.orig.tar.gz 202964824 SHA256 a4ad20d53f790d5105351a5627fadbf02fe4945582abf2b93a337b1bbaa0b033 SHA512 499fd955a170d8157a974acdee981ce0a444262465624bacea38a23421f9d80ce3481b20a0d0daa4469eba85a69ec9278026c127a2a1995f52573adc5b1808c7 WHIRLPOOL 00ccd79433499133367b669740b494de33ec9de17c2a45f3d1222ee8d8cb9c40d4ad8d7043a2593bb3e1fbc66a4f65a7fd756c61a40fdbc9cf9b6cb1d693e25f
 DIST linux-amd-catalyst-14.6-beta-v1.0-jul11.zip 127042528 SHA256 9786b8d695069ebe132d4c6ad8bd011688c28af3fa1a11c08589f38f1854a962 SHA512 029df9ff5ba1a90bb54518726852b20ba3766e3b72d1071d99dcee076dcc505e5d81433308f1213413257f4afe450fd3ca3fd29dc611fcc1126a8c148c928f73 WHIRLPOOL 26bd3eb371ac3dbefe539a4ebb31718db7153c2382b9e5f650de094be309964e65f1e55136313e4d5430ae18e661faa547bb6211efb1d6b3ca50487d99756195
 DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
-EBUILD ati-drivers-14.12-r2.ebuild 20118 SHA256 b1e97b792b5728a8a031ba664d05eb7eed9e5973a293f68c6b4a7a54042c2ee0 SHA512 c7f11d3e7f7925d8fa4818b720961c189b9710639e3fa3334e32b0080962bab099a88c51313623424a70cc17ca1b67f1f3eae2359a72aec3706193029b41bec3 WHIRLPOOL ead0542a1b67dab21f6b9aae82fc62e8616408568a5161079ff2a4423c7382c89d7794bf9629bbe16cf1359f8fbdd8112ded7872bfb0375669084da302e5a293
-EBUILD ati-drivers-14.12-r3.ebuild 20309 SHA256 aa1900db616b9c75914c5492e9162f5caeb6b569a3074f744be238f0feb96608 SHA512 88207a2c73935f0cdde0ab3a0f19b91234e309a294cca69ef8d21df4245ddcef785f652aa70adc1a6599529ce98d432202c38dc8dbf2225a610baf087e681cf4 WHIRLPOOL 8f5414c9497f7d4c3e8d5af3721a27199bde5e89b89defe085cbec952a60164c1d95c966e880d814d34473dc90f93b3a66e70436074be9abb55fa89f46ad5337
-EBUILD ati-drivers-14.4_p1.ebuild 20363 SHA256 73985d24521157d9b79e0764b3be26f0e285426f5536b8fa0e853431ab98875e SHA512 117d202e7b83a25ebb92ac7521c7d9d073016ba61b9eed5d1d476a53c826d2a722fd471e1842202596b6f3772b460796dc9f174bdc0fa17d1756ea74ca9d5f55 WHIRLPOOL 0e84c2f31a9a19ccd3c0103e7e7452c692349817472aa6f28b78adbd320c3a5e9863ccab729b6a4b0080c54dc1686def3c483398df28f3b64ff8ee4ff7b706c4
-EBUILD ati-drivers-14.6_beta2.ebuild 20294 SHA256 7c532c53e269e6e6a5707634e95e07647b9916e86d301191c2a0793236dad2f2 SHA512 ce9be506525630b2748dfba243f296592d93b9c69c61b5d9105f0c7344cab1b97f780138d3ed84b9be97ff96c92426a0f08bac8e16cdae379401ba88afe75ddd WHIRLPOOL c0c7c523307548956a2dbee82a92462c132300b69940dc513c780d1384ec1c1081eb81b9935a48f03acb40e1671f770fe70f8541cb2bf4883868a7a21d6d74cf
-EBUILD ati-drivers-14.9-r2.ebuild 20055 SHA256 1afbc3d6315809ea71af19c0839c4939c525aaa66f9c9a5f8491842ac2f9eec7 SHA512 f564bd3455f0cf770a6849027feab5f26c1b513e2cd911c00daac01ca6d288653e993d0eaaae2837a17e2a5c24aa122292163f9b3bade79b5c125ff4c30a3788 WHIRLPOOL b7b83b57c7af951b5ab5047518f3134a09483ca1e91834521cb5ea1758351a85b60a7668d4141ec76aa51d2db68bce504e7b4c3ec0929df53dbfce774da173d3
+EBUILD ati-drivers-14.12-r2.ebuild 19990 SHA256 e0bd145391ee66f1d0175bf4b27b2ed3816f669bbcea716c632f5d5eee8af9c1 SHA512 4e381dc2efe64fd90bd8e379fc8835785aa510fb57ea61f38561bba7fa127100b16b503857d751bf30b779e9e39093e655ae54c4aac792afdb4002764fbc1830 WHIRLPOOL 36fcae87d1f2ab9634c044c4f27439e4ce65539e0ea752f373c47ca2488b0f4fd49d7f086f592f0f4380a87d875dc02a045a59d17b543eb0d73257ab3490e443
+EBUILD ati-drivers-14.12-r3.ebuild 20181 SHA256 c29aaa444a199230f9c3f90a902f69dedb07e1049fe6c711c9bcadf7900c2c3b SHA512 bd98d8227e4ffc02c8b8f3899124eb2b8e1e5522af5e2d795cde4f4d7edd07dedd5f90c9910f6b16693fc0fc4213fe0fe6e7925362c36ad4af9a50c35267cf30 WHIRLPOOL ca8618ef065c3901e6c024bf38dd4fc4f2e6890b69162874ce70e679cff51cba30b5394513893f94d2953c0a1df95b1ad736b64264e89965e88698244d854f77
+EBUILD ati-drivers-14.4_p1.ebuild 20235 SHA256 8570d8d8870edf4b9c953875f868fb352fc91e81d1417365fafb404b96e4ba72 SHA512 c57081ef8c2d1f095279eb0d96ee192606f8aebe6ba1153db55ef9e7b31310268eeaef123928a43f47e0b63ad8c9491ccb20609ad999b3159236cd5d96116a0c WHIRLPOOL 7ee56b48b0980904b61b540c2b0eabc68b6fdf4f8aef3580cc24227a769f346bb608341b13219301c593d6c5a3c66b1b44e88b2098748f1aca728c2cb7001681
+EBUILD ati-drivers-14.6_beta2.ebuild 20166 SHA256 6a04be81364375304e89c3540f28fbe8a3ea483aaf0c35d65d00bbae34a717f7 SHA512 919d1096701b3837af6c5c1ae8e14cd2ee0553d85b8af1d916d232be859102d71c5666f9363b82ad50c87996de70777fd3bd6893343d36bc5535b06b43e92a00 WHIRLPOOL 665fd4139871cf30066ab1a7bbfa4cf501042f90812ec856db95831d400a70d8d742da8950815616913f5e6943940b3152eeaed44a9c56cc50c9b54d87109ae8
+EBUILD ati-drivers-14.9-r2.ebuild 19927 SHA256 f9ad2ed03353e6a854078a6fa14a862fe4e2a5fb89fc86f888f8665c2898eaed SHA512 14f32dd7d46588559c66801fdcd0b892f284fc61a18290022613ae78dccffbc5cea6b0b93637c334a89b56265faa26b8fe0927c9c59260702b1305560465ddbd WHIRLPOOL 6c098fa2ef89d93c8d61e85a80e374300d3d7fde17f5fcd18e665a240dfbfe56b272e8f2209ddae30e1480b3e258af3b6584c4c01d324335673a65c80b64b606
 EBUILD ati-drivers-15.1.ebuild 20574 SHA256 c8b03be04a7ab4e703885fa2c9ae3a6885be18776a47ac276a4ee52c14df3dce SHA512 5269ccfa2959e311339c05ac908b1322427508474991f20a079fa5ad4d2cf762fdf3ad15dcbb569b5d23e219d2dfbf331001b59c2a2cb3d68cf0c6e79def3b60 WHIRLPOOL cdd52dae6d7c9a629e61daaf32df70affdce3ce5cd78c39acac9f64ca6d7c0b6f05550d7ce8b121e04cd547f9394a4ba10bf0c11cf2054667702f91d3ffbaf13
-MISC ChangeLog 97272 SHA256 bb744fac8a2172bd4909647ee0ae6709ef4748e4bcccd6a5336e5efbe1493233 SHA512 d8d6cdf7cccec61efe7067ca501b89e1f95a168761c5e076b4e62f36511d01cc90a9a0d258ff09d9c27256dfd08f805d394b2d93de5eaee654cc23173c378972 WHIRLPOOL 2f8fc8c15f465adc3911223256d10baea48bf781f7741c15077a71c5ef7031315b8e27810dc6942007f89ab1e31a675e2eff057da21138f26b20a490c3037db9
+MISC ChangeLog 97516 SHA256 18de0988e4b118a30ca781aae5db2ca0f6cf0f39c21f90c5464ad69eedaeecf1 SHA512 643aab10d990b47e5c408d540e9449c975aec649c2a7bc0e5051235226457dbef5def49314e43c3a30d45e612044cb0197ce0ebdb3ee25b98cfba9929d982c53 WHIRLPOOL 13511ecac598124a7a793c5d8fcb8bde6e9a6c5575ab38d64049e4b48a0d33d4bb70a23829936415c44410f638d8fca400c6af5a699930774ac3bd858d793ec2
 MISC metadata.xml 770 SHA256 ff0388f176ac349ff17ab7f038fd23359009cf6b683e40f699cb75db04536116 SHA512 df8e43ab42b2e24d83b64d593ee539c12f93d8070cee6e3f0af6a09d2b5d988ef93ece9be0e30ae984500aae45ae28dbba08e13a07ec42895f153a8a14832271 WHIRLPOOL 882ac84772b2e79d09487b3e857429d5692641e8fddd0e8bc8c2427668a00577cda34d6113c783c4435c6f0b26aabb332b03ef55d9b50dbfc0671c38437b1437
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVbIPEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtWcQAJvB5Opiaq8b3gQADL4Vd+E0
-iIpoNytD/6HWAa+k1b27Zh4OpWXqp9gDj468/lx9GR3CtSFsMpapgjNtSYPYkVaj
-4iLeSH+Xqu4kkQsttZIq097RnP8il4xSf+ZUVia7kN2pYIqZI58C4TDcsgi7SmDs
-OisGN2bxeIWHGbTlPFO9ixjjjcevv+u8ugFsmiyPDxC4KOJBE0gAM9pdLoFZQyTO
-WTQTOSS02Xlte8S141NIYZcFQrrPPp8qaPwvCuz1CjQV7zUB8OixPeLm/Ca5pk/O
-IG8yeLRp1bSovmQe2GLbjvB/Y50bw5j2DrZmf+VXhVUQhfX/e2+Lsw8B9rsw5mUs
-cWfQalLJyli5Y3JHqWwb2TE9np9eW+Uuuy4c/aYZ1T9OraSYoIqN4udxV5Vi3YhJ
-9VRJqggw1X/nnrZeRT28WCv9kAWHrR4TVZ56vcBys53Yj7NS0UXt0evpYVqj335d
-caIBbzyQC3ulvlHXMQ6A6Q4FFizVD3VfoOnGHlTdf+IN8JdSJG31Bv6x14hv9avr
-Vb3Jka1EIVxqzWc45Cvjs0tn0SJhgqgURxIar+yPHEAo6DP4GsI59LO/o2Tpt/Or
-Zvkmqf6e6C93JCMbw7zJ1hyAgBrkm+I3WLDvHV/lucsFFPGpDp6G1oCAJmhX4isz
-Ceje4pOCP4vT/auz4BOl
-=ODTJ
+iQGcBAEBCAAGBQJVfcOCAAoJEJQzkH1pP7W4n+EL/3YisUuyWUgPVaUQy4y25EVU
+Md9mfWHB4jYVBROPl5NFx1+J7DjvKaPV1LuwmFRhxzmBgQJM4LKgpjUwq94hnRFO
+58D8bB8UxmpMzRyv/tOp+Yg+HGtZVRG0hZzv+SaN8tUTfsmvnEnxOsBOWCq+irQO
+03Rl31e6C0s6F6isOhBj1R/ZNj3EJlkWd0WTkx4UYT3qnYHwLYgdiZeO8wjfoqYi
+ZjgK1G1uXHG6CULPIJx0kcF1Kr2naV0kNPr+MaRF1B862N2SRLcSRHWdPoBjsKG2
+VIzeZnefVnAMk7dZDjilCWripB+WO+gQlxeGQqemmiqUJZMvkpkug8COGlzW0MYN
+GModB7yGd4PIkRCtW1r+Gp87++cHLMWac7js37GabtfPxVqJZQi0D2+cwsaaWDwV
+rSkMsEF8s8ZH2DK+EArfH2GJjjO4ddzx1KuX6WP3UJTg/+Qpn0uQ+Cc5rVjO9Jo0
+bCHQoAgwd/aK1FhnY3oZbGHLW0qBws0RjsteJ/nSPw==
+=8rG5
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
index 09170707b2cb..9931122f2374 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild,v 1.3 2015/03/31 18:10:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r2.ebuild,v 1.4 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -37,20 +37,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
index 669c0e1b54f0..2d47bcd0eb7f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.5 2015/03/31 18:10:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild,v 1.6 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -38,20 +38,12 @@ RDEPEND="
 	virtual/glu
 	!x11-libs/xvba-video
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
index a78cc7e4a48c..820b615f79df 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.4 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.5 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -36,20 +36,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	multilib? (
-			|| (
-				>=virtual/glu-9.0-r1[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXinerama-1.1.3[abi_x86_32]
-					>=x11-libs/libXrandr-1.4.2[abi_x86_32]
-					>=x11-libs/libXrender-0.9.8[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=virtual/glu-9.0-r1[abi_x86_32]
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+			>=x11-libs/libXinerama-1.1.3[abi_x86_32]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
index ae79e6bc3a1d..3942da1e9dcb 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild,v 1.2 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta2.ebuild,v 1.3 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -36,20 +36,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	multilib? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
index 67f7195cf12f..5e007ad32cf8 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.2 2015/03/31 18:10:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.3 2015/06/14 18:12:07 ulm Exp $
 
 EAPI=5
 
@@ -37,20 +37,12 @@ RDEPEND="
 	x11-libs/libXrender
 	virtual/glu
 	abi_x86_32? (
-			|| (
-				virtual/glu[abi_x86_32]
-				app-emulation/emul-linux-x86-opengl
-			)
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-					x11-libs/libXinerama[abi_x86_32]
-					x11-libs/libXrandr[abi_x86_32]
-					x11-libs/libXrender[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			virtual/glu[abi_x86_32]
+			x11-libs/libX11[abi_x86_32]
+			x11-libs/libXext[abi_x86_32]
+			x11-libs/libXinerama[abi_x86_32]
+			x11-libs/libXrandr[abi_x86_32]
+			x11-libs/libXrender[abi_x86_32]
 	)
 	qt4? (
 			x11-libs/libICE