Drop emul-linux* dependencies (bug #544876).

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

10 files changed, 44 insertions, 77 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 554c059c90a4..638bbcba8c86 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.622 2015/05/20 04:42:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.623 2015/05/30 12:30:31 jer Exp $
+
+  30 May 2015; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild,
+  nvidia-drivers-173.14.39.ebuild, nvidia-drivers-304.125.ebuild,
+  nvidia-drivers-331.113.ebuild, nvidia-drivers-340.76.ebuild,
+  nvidia-drivers-343.36.ebuild, nvidia-drivers-349.16.ebuild,
+  nvidia-drivers-352.09.ebuild:
+  Drop emul-linux* dependencies (bug #544876).
 
   20 May 2015; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-346.59.ebuild,
   nvidia-drivers-346.72.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7327dd82d1be..db997960589a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -53,22 +53,22 @@ DIST NVIDIA-Linux-x86_64-346.72.run 74095832 SHA256 2ae3777bcff6bf4883b6a903c82b
 DIST NVIDIA-Linux-x86_64-349.16.run 77513301 SHA256 f980b22729b20c9eb3a3a800af524da181afbc78e2409a3f83845894983f8322 SHA512 143999f5401ac8634049786073203fab7e8d23dc9e0d4d62d4c6ba9945c20f7d4034c37d0f721aae540503f6bcffbf200a0af70520ae7ee10a2529ed92a14866 WHIRLPOOL 9a6817c03d11253ed606294d2cc2b5f2c4c612af2f8b6f72228a9e21d4991f8bcf248a28ff70d6f477860a64bcf795ec0ee2f73c34904e5cdf0979d41e370042
 DIST NVIDIA-Linux-x86_64-352.09.run 77584888 SHA256 a3ec271896b775c936e1a14e7af2e8ebf02b0bd59381217510185b313c5a5fd6 SHA512 36c3aecbf0cec492d29905c0b1d0bfa09e93d596d6a49dde1ddebae917de3c2e4941591b520729cd1f8139d1cf66c3bc86144213fbe04c264fa1120aebdd0dbc WHIRLPOOL 9f49beafa66b2f2d124aa2f2f42a876e9b10ae88da75062f02ccd7d471feffccf10ff13212f805dd86f20ede53da27dd1fe45a26586edda3bd3d0d72e8aa8b76
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
-EBUILD nvidia-drivers-173.14.39.ebuild 16636 SHA256 46a3b59d225c4f08f24bcba5145149c95f5a81b5e0efe0f5a474edb0dcc6824d SHA512 2eb4e66a53efc538bf8047eed95874608febde2b546b17dfd0930df890694bc65d8a9cf39af3d61023da6876ee0d60bea92f754a4ddffdf875ac46c6508f8504 WHIRLPOOL 4eb11e18e4a272cb0e2b0f1cea72c3f6c305cc01fc05b309869008230e4f2985c68777aae07c4ea5c4e0e0cf3f1de31291c9d44f5f37db1ff131b691b20c80da
-EBUILD nvidia-drivers-304.125.ebuild 12575 SHA256 a7b26248683298ddde7e5bbc895622af7a0cf8d8736ca07b96bccdb148ab9115 SHA512 ab74f27455c9d42f0742d620c09d92fd5cb58905cba664c38360011c1b4a011d6ac72e76b7dab133666510cc94d0fa2a39e9d2b641e72995d39e39a93734a51a WHIRLPOOL 289b596e35b845fd6891278cb4890887715bbd4bb65933ccf05a63adf4021d7d2fdbd4d728d9ac335bee873db541736ae60a026cd07b6a95c662945174ce863f
-EBUILD nvidia-drivers-331.113.ebuild 13165 SHA256 4d41aea2ad6050844f6bd8b03abc4ccda652447b1f04b0a38e8e3fdec6377ae5 SHA512 b066554bd7499ae4d657eecd9a3fd3638e0e2fa924a06da60bac9205341179a418b80714ba119de41fe86262277eeeb365d9018fe5817f51862ba2e42bd40a7a WHIRLPOOL 4e2d8c5677d34dad39c297aca4c9ebd6b77deba15bec26eaba3e4b11741330e3aec4fc9373636e66c29dad5de089ae65a3aaf90fc1c9cc0afe00359e8b5474f1
-EBUILD nvidia-drivers-340.76.ebuild 13634 SHA256 dc3069d5c519040617f352d81759bd5b4028007caa2dbd061fdf0005de308a3f SHA512 1375ee78585ee85e4d928bf522bbca9970927c2606ef3aa2f98af09be7097a08579987712d1ebb6c5ef1988fc352f9fa87c06003478efb3c6b6dcdfae8e1417c WHIRLPOOL 40d08c2fcfbdd8cfccc065bc031401a58febd1f3411eb8ad0af83f7574225f7c05ed3586ec479ca748935390c879540ceeadcb4835613a86740200a53bf444b1
-EBUILD nvidia-drivers-343.36.ebuild 13634 SHA256 deb426c40c0fe3bbe4aa2a4b3227a212175fb97bdba4b3f988436dc904f223f6 SHA512 538807090b2319eebd6356f49be3fb63da4435faf858e09473d089276123ca7c73879e471308324bd0a500a624be9fca483762b8ebb13a154519425c01615e70 WHIRLPOOL e215467c02c1a095d05a8a3fabd8e6aa126e9c56b968e12f4a65fb5f874715b04891c515fd4bbad0b276b1d38b8961b6eab479d96ebfa5618a4f1cab31ae76dd
+EBUILD nvidia-drivers-173.14.39.ebuild 16573 SHA256 e575bdca8266b186769167ac48284933e977ca294e3e66486803728050dff57c SHA512 14593523ead8a0173216ee9aa9d7ec11f4618c88f2704c2c3e34de04ec9e7990b6d3276ac24e3b37be2288b61f377ce03cda227977f9418db8afa5909f1b9379 WHIRLPOOL 1e3b46fd4ee28b354316004ed779b444a8616df83754068818d378f4e7e8e26bf7b2f65ce8566d42d869badbb06922bf693fc3ea371a2f1632f6f5a869c76ecf
+EBUILD nvidia-drivers-304.125.ebuild 12507 SHA256 21f1b9c385e3ddf25e5d278b953520f473a8809027843690193ef0ad60159bd1 SHA512 cc1da5befd47a7245f612568bffe31d40a084fc4da767b19b8e16aa33695663c7eae5c63d5ddbcd44daf74c1a91d9d0ed5fd64875271d0e056e2e02e15d765cd WHIRLPOOL 8f208d3a31960fff8148ca2e71497690b6d887ad1c2eb1839561787e90ad26880ce16b0def8ff6d31efe32780b087fbded13b9cd291cd4b25269c5465738d5a4
+EBUILD nvidia-drivers-331.113.ebuild 13095 SHA256 e406474e09012c6088a377b39f169626be7f0f6306a1cfb1f915ac8b7ae5c6c7 SHA512 09cb769b5ec552baaa53d876ce760262cc550bfbf0f5f6f070bf83969f40d2cf2db0a4f378b23a097c91b98f43c920f9c38751723a432dc8a96398f1a7702de0 WHIRLPOOL 4894766abbe658cce2473f55342e7309184bb5114b48acdf1c25b702e35467b5663818d326b461135e55c04cd736e31eacf134c385e266385bb8f2b35bcc12d6
+EBUILD nvidia-drivers-340.76.ebuild 13564 SHA256 d3ee4e07bed9f094253db42272bd0acee1a8e393b9da8432d74b8f811759b880 SHA512 aa10b5edd941c84f6a8bd6a1a7e4dccdd0d5a92dae202a075dd583883f5c25b7b84ba0cd5b49f9e74f1316174401414b9cc78baa71ad5546cbd9be5e058ab45c WHIRLPOOL de305a2f97362f44637e4a6eb8d5cd06747dabc561cb953ceb1461b7bc14119cc5e2235c26a1979f1080179d43b62e97bc979bab9b6dd90e02a511bbc0e6ade5
+EBUILD nvidia-drivers-343.36.ebuild 13564 SHA256 669011847bfdd3dc422668674371d42dab2501be153f8eaa7f07ea433866f953 SHA512 2a896224728540675c35e33b7c1d67093cdf1acb9416e3512347d098e311da3b687d9a7e46e28390289a36b995c3a3a4c2f929cdeb4c41072a481af476522f2c WHIRLPOOL 4015b21a7a25cf864061e9b62dcb3a6dad577236b916fdf9077d1192cd7cb74fd4a6bdd029ddedb365099e396e018fd6ea4538fb06d0f38c495824f88a293e1d
 EBUILD nvidia-drivers-346.72.ebuild 13943 SHA256 a9d9af59fe7009dbb400fff2dbf6f579f2dc36b58918ab8778c4ae6148b2c703 SHA512 155e085db701230d0504c2b17797720b40c91f207ffe183dce051b042f6aad6ab7399fae427897b2cea4862d56fb5302029405e5c8f0d34a3be6b3e21d45e085 WHIRLPOOL 03bfaba87cd58ee3cdac8084c3c3a7808da00bcb5f8f74a5b0417b5d0b7003656b0ef6625a7f847392ab9f2ccab7a037de3232576ac43cb1df998c781479c754
-EBUILD nvidia-drivers-349.16.ebuild 13943 SHA256 85f700a494de373bfa890ae1e5ea7319c8e3814f6a3aa951758399be9bf8b7f5 SHA512 5f83aa9186a52aeeec848ce23ab7b2ec2ebeed061fd878f00450aca63652f0d1b6a92f754549895954b463ae0bd79dd88108480ee59deacbd0967d3b5622efc9 WHIRLPOOL 073bb447cf73066ee95a28f6609dbf9ca1dbd76891a9bb2fa09e8d755edd828ff48a9fb30189f4e449e1d244db587ee433777e4687e8a776870dac3c1201fc12
-EBUILD nvidia-drivers-352.09.ebuild 13945 SHA256 e9e8198c6830c26c172448446ef6ce587f9f67f21ced3c8c9c5e16bc23827c03 SHA512 a33c1c668406d803a00e23ccdbe57658e1cf2468174bb6b810a6ce3450e75a345913a3300ec6a7bb35c2e04a2802fed8698f9bbe13b6fcc0362a17ac6d9508c0 WHIRLPOOL 6cf55592cf9bbd9a66e93d0373ca609b71cdc4ebef9bd9c6ea9587855dc8ae8003be80f3dff7081c4462ad90a8d29b4045515a6b96721b5baa09c9270f247d53
-EBUILD nvidia-drivers-96.43.23.ebuild 14902 SHA256 6449058f8cb9aecd8b874638874fa073f9b6e06913b846792277c915135f4710 SHA512 7d486825401caa71878f591141b8bbb795b4789fa2fae53fdffa8ea8489635424889ce50f1933cabc4192baaccc4d22552d4e124b99a9400c071a6a9187fe7da WHIRLPOOL f58f339a8196d2a5a70cf83a6dfafa6bc4c60c627428ce7381ad17183969a6dec5f2ebe91b61c373889498dbba533c5a88b7ebb65a35807baa5a5c83083e248d
-MISC ChangeLog 20067 SHA256 5dd17c3c05bb7100fb713d01dba8956c8b39272af51061fbdb8b6802c533c19a SHA512 a1d9a7a28cde90add2cd4e02855021a89aaadd8db5caba62f08d60be5850621888c45df2920cdea95eb116d878696efe2a5bdd58e7fac0a622a67544695a457d WHIRLPOOL 9bd666e289a014714b694dc7a6c0460284e21dbc1be51f19d8ca5ce9f6a10f4fa1ea13bb3cff1aca7b25dcb673719a12bb75c01ac305a6521e83f9161d2bc8a9
+EBUILD nvidia-drivers-349.16.ebuild 13873 SHA256 0c1bc14a72e6eb90a02bc38323773709c886c172ff18b0b08a01c6cea2a21d3b SHA512 7f865beb54d147da87285d6809ae725c52d0d6d90a4db9a00189d96ed526b6d5d3175f479ff505f26858649a1f5f1106fc5438a4d27f76460cce1143f185f6d0 WHIRLPOOL 454e7a4b1e29e0e29cd32b9370268ba0785d20a82ab6930450afc586d9daf9c3e4920e2da69538875c1f3cb187bcd4610d9ef7a95c4f8c895e13aebd7751312a
+EBUILD nvidia-drivers-352.09.ebuild 13875 SHA256 538008b43b8a4b38395c1061dfe04600ff40e9f29659f5fbd637392d51ad8fde SHA512 010dd6b32442c82a400b6be5b75e10c27b7a97fb92d104ca040b7b8883dc837e744ad13f8121c454f2ec6f68798fa17cbdcf14be6442fad6ae971a71f39d49d5 WHIRLPOOL bfbd785554c47457e9597eda647b750b0d699522b5f421806e055bad5eb39c3f1591696068527e0f111f7d156d7aaf3dcd989ea3dc94197cce852e4ba04145b9
+EBUILD nvidia-drivers-96.43.23.ebuild 14838 SHA256 7a88bb8d5f50c9233ae7aa52519af39df28764f76f2dba689aa1387e4ecdf13b SHA512 610e76e71639adf700fa1c6342965ea92ba5f76d1ddd50d04efe2f4a472f69f356260096fc0f3e7105439d1a44944289a57be86b891849d14c9dc3f57d4c400a WHIRLPOOL 4033ce529f13cb0ca15d53584f442755e57b5cd2d748ccfea3d4b1ed918ab51e0c4675e4ae08a89f0d37cd007fc52b2a7e4eff1317a3ba8d8e128fe7980c8c57
+MISC ChangeLog 20417 SHA256 1cc4077f9442a7e7420aad127f249ca0522e8af309592b227433ef602f16e286 SHA512 9b627aa8e068b4c82470986c069de0e48d0ffbab6375e2d5bb7b6b355336431b7595bf24e4042cba136aca858fdee3c9ad286276f44fe3381911a25087fc61ec WHIRLPOOL f97d55708d48cfdd30d3e0889028b6ed21ed6b89c0a6170b0388c449a51417b9274f8b484fff623b474edf0d8c499b10079b0cdcc3dc58d67423083cb63e3679
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 739 SHA256 f455845cee6b0247e229d7635f300565411d8e5f7462c8833a4ecad2a4ddf343 SHA512 f1a87a421415e988f96a597247eefd24285bb9709b81ff446e2056bf9ea99c170216c92b43605cdd0e238697989031bc72f8aa104231b1e36fc2338677312bda WHIRLPOOL 95199a2e4e10954ce93daddb0802e608fb4425ae73e57cea61882960ec4916b556b7ef7a87b315a2c6687e98c603e049003948f7388a9a8f8cf8714a16ba6734
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVcELoACgkQVWmRsqeSphNWEACaA3O18lvZ7NJRz7Pk7Imv8cdZ
-UdgAnAnjPIZnCzwpsioDNNGW6N3P3j4D
-=1TWP
+iEYEAREIAAYFAlVprWsACgkQVWmRsqeSphNXDACfZU6sRuNESMUzrm3RuTeVUIVC
+bicAn1fqo+Fkm53A/n8WUqCkNq/zUET/
+=5EJ8
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
index 8a0558a27d73..583e87839a6e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.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/nvidia-drivers/nvidia-drivers-173.14.39.ebuild,v 1.9 2015/03/31 18:12:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild,v 1.10 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 
@@ -37,13 +37,8 @@ RDEPEND="
 	<x11-base/xorg-server-1.15.99:=
 	acpi? ( sys-power/acpid )
 	multilib? (
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32]
-				>=x11-libs/libXext-1.3.2[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]
 	)
 	tools? (
 		dev-libs/atk
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
index c3def55e0d81..1daca44c14b2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.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/nvidia-drivers/nvidia-drivers-304.125.ebuild,v 1.7 2015/03/31 18:12:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild,v 1.8 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
@@ -54,13 +54,8 @@ RDEPEND="${COMMON}
 		<x11-base/xorg-server-1.17.99:=
 		x11-libs/libXvMC
 		multilib? (
-			|| (
-				(
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
index e35cb53e5d0e..12a0ede7bca4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.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/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.6 2015/03/31 18:12:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.7 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 
@@ -57,13 +57,8 @@ RDEPEND="
 		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
-			|| (
-				 (
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
index 5f8f3e672391..6714de617e3b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.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/nvidia-drivers/nvidia-drivers-340.76.ebuild,v 1.6 2015/03/31 18:12:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild,v 1.7 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 
@@ -57,13 +57,8 @@ RDEPEND="
 		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
-			|| (
-				 (
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
index faada5c791d8..9591949096b6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.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/nvidia-drivers/nvidia-drivers-343.36.ebuild,v 1.6 2015/03/31 18:12:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild,v 1.7 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 
@@ -57,13 +57,8 @@ RDEPEND="
 		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
-			|| (
-				 (
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-349.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-349.16.ebuild
index af759a0b82ff..46797ab8a2db 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-349.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-349.16.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/nvidia-drivers/nvidia-drivers-349.16.ebuild,v 1.2 2015/04/21 19:30:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-349.16.ebuild,v 1.3 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 
@@ -62,13 +62,8 @@ RDEPEND="
 		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
-			|| (
-				 (
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
index d9bee1cd2a90..6bdc88029593 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.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/nvidia-drivers/nvidia-drivers-352.09.ebuild,v 1.1 2015/05/19 05:52:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-352.09.ebuild,v 1.2 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 
@@ -62,13 +62,8 @@ RDEPEND="
 		<x11-base/xorg-server-1.17.99:=
 		>=x11-libs/libvdpau-0.3-r1
 		multilib? (
-			|| (
-				 (
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-				 )
-				app-emulation/emul-linux-x86-xlibs
-			)
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
 		)
 	)
 "
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
index fda2442ed701..ebf1b3e5328a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.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/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.25 2015/03/31 18:12:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.26 2015/05/30 12:30:31 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
@@ -44,13 +44,8 @@ RDEPEND="${COMMON}
 		x11-libs/pangox-compat
 	)
 	multilib? (
-		|| (
-			(
-				>=x11-libs/libX11-1.6.2[abi_x86_32]
-				>=x11-libs/libXext-1.3.2[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]
 	)
 "