Set dependencies on multilib-abi vroom-fondled 32-bit libraries (bug #466752).

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

9 files changed, 127 insertions, 46 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 10bb006ef430..40cefec03b63 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.450 2013/04/10 14:51:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.451 2013/05/01 20:31:38 jer Exp $
+
+  01 May 2013; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild,
+  nvidia-drivers-173.14.36.ebuild, nvidia-drivers-173.14.37.ebuild,
+  nvidia-drivers-304.88.ebuild, nvidia-drivers-310.44.ebuild,
+  nvidia-drivers-313.30.ebuild, nvidia-drivers-319.12.ebuild:
+  Set dependencies on multilib-abi vroom-fondled 32-bit libraries (bug
+  #466752).
 
   10 Apr 2013; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-319.12.ebuild:
   Add xz-utils to DEPEND.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 24eb8cf6359c..bcd7a64f9773 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -37,19 +37,19 @@ DIST NVIDIA-Linux-x86_64-310.44.run 68380500 SHA256 585365fc37939794ab7ed6907ab2
 DIST NVIDIA-Linux-x86_64-313.30.run 68379307 SHA256 72317f2e4c459c33c764e3283deb3e1615b1852ead1f9bfad82148e120506022 SHA512 ae4439697e47eff98e06e5f77de979bdce096f95efa8bdee9c6fc939b42b5ce3b11c23d7691e974cf0f6f783eeb0fb694670636538352a0e8979f88d687f1f86 WHIRLPOOL c12a68fcc4d78f3856d87a86cef43c3632c0db1b6c5799b6482584d4d83a7cc863b9b394a501b96534175e11663c602d72f6ffa49f85461eaf4324dc61e654ff
 DIST NVIDIA-Linux-x86_64-319.12.run 48599567 SHA256 4b68617d75d0d1149d2d6e836783429c715204fad567aa621ae7982df676a8d4 SHA512 b70459691fd46705c502c6d5190e9487d54455f19f48de8a944c9f0c9c1f04e3e7e06d35c7ba0711821b8e78c0c698e50032329e7ebb2436419040f3f1fa8ab6 WHIRLPOOL 08f204305f36c1bc6f8309aaa23f51acb061aab4b4e7e05844b3d233c59f3d47a8d212ba25c2b90d076b9335d600f714a7856fe4db136ad4dea80b1b6f692191
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
-EBUILD nvidia-drivers-173.14.36.ebuild 17188 SHA256 2ebe4132c9f17d391a6dd45b87934c70f004920f33a01cd838f52c04b35ff0c3 SHA512 056b8c49e39616630cb711574ac7096dcc6f7e28a87ddb0f862b9584df781d34fa57484d164d6b489edb193958638cb1d3dc63f769a181b6e80c4135677b5d17 WHIRLPOOL 641e8758c19ec042db8914184328574e8507a328c86fde9074930555edcb9fd66fbb67e3f49d62b9f0a3df7d17c5a8032dc5a203256148ac5e9202298c3252ec
-EBUILD nvidia-drivers-173.14.37.ebuild 17174 SHA256 901c43875bf2da84abd7376f6bdc59d2c1b6be7e74011823e7f43cb0ff59f7d2 SHA512 ba146d39c6e95197ce227445541b4189587524646e309919f9529d28bcf880190bf721fe98b71e3971b9c275ed03a6f5daf7979c56b7667bc8195d2be1b3901f WHIRLPOOL 724f0f06c3c5c88cbd8cf5bc4fef2b1514d2e0c3d1b3de2f8b1ee23f287af9872e0a9ba1fffabb4996a7927a01be899529ecc7fff431ddce1809c96cc2bebac8
-EBUILD nvidia-drivers-304.88.ebuild 13207 SHA256 df836831cf120a10595d813029888a4d8bb5d4c218d3ffc97ffd87e07991b568 SHA512 766c12618d3dcccd155f2fa006b986a2ae8de3a7708d55dbcd5ab4cca63abc3be921efccda756a5240813a3db3cbdefa83b5c90058fe0ecdab2333ff06b3226c WHIRLPOOL be62ee858113936fe7f7becaf01929285a91d6f82c3ac9e6cbd12ee40aef06372dd7b66df2a4eb6cc54d41357ca69b5e92075b586c8f9d828c29bb6ae2fe4aab
-EBUILD nvidia-drivers-310.44.ebuild 12797 SHA256 899f51bcee5b4572eabe0bec3f9751b481d9082a7a010178ba356d9dde99ba87 SHA512 6deec003d30fb6f477234c22572b9dd3a71149dab261fa0eb5f6404084cec9382e014860c725059f5453b87b976aa231968d338eed254deef2a0e576a764d319 WHIRLPOOL 0faa98cabc6866f3a98ce9f14e927c3da7c420af944dbbdaebd1b3b6d2e7c81f95d33ac17785fb3ee75cdd497bbbf1f1238a7727e4864fc185083cdf6c5dc0d6
-EBUILD nvidia-drivers-313.30.ebuild 12741 SHA256 20151dd4ac9cdb3662c725c9042c76a359a80674e3c79f649fdd21201de45fe7 SHA512 c2a17a96ee2318f399bf3d6e4d5889a2492b1957f620e83fbae8df9b808c6475f52bd5e10c6250866c2bda5427383d086f8652325ef2add8b96016f1e9e9039d WHIRLPOOL 1e37d0295c817c34980f8000b9d17efb9d7088decad9ccb9e7755d8aaad1e5462ca7cc8ba5219eb89d5da43d47d149888f2c0023acfea36b737ea013d4a27b35
-EBUILD nvidia-drivers-319.12.ebuild 12764 SHA256 33444c93b16d66e9d462eb4ad1be5176604c010e3b16a98cecabecd98446aa4a SHA512 4d953d75f5c7e11dace37046205d7ac50290ecbedaf5c11370142efcbb501f07e8719f9a508a8e2d78afe04380a025a8a309f1d32d688143beb4b4bb8b890543 WHIRLPOOL 3f2d5a89f58c3f0c6558c2815b257a9eeede831cee982b113c5763230bc18ef1398844c25fde64da7e11aa295e8ecab89b3a15712bd6fe5802f231de6a5204ec
-EBUILD nvidia-drivers-96.43.23.ebuild 15841 SHA256 86309432b8bd79ae20ff0e4e3cf099f0f135fb3ddf10d10148c143ae328e6199 SHA512 3c488a26c465066d79394cdd1c1391177408f420e06e41cda72ff4341a4a4053ce2935cf4a06d4399c7520e3d61900275db9710bfa8af174338ba1460e5f4459 WHIRLPOOL a8264b789a1830f8df4fda8d0de6fd02a5c2343a7d1016784e288f9dedafa7ce759bff69e7fe5ee803910850770ff7f0e5c6cd714a3b48816ec6759abfed4d8f
-MISC ChangeLog 93715 SHA256 981751dedb3c3fa2a09edc2fcee9d8d51a77e219c00bcc40e2370c62fae9106b SHA512 d477fc5409d3aeda33ee386f80786cdbdbd9e3a8f08ff1bacd8c23f0c8420ca78383cb3224f5be5c793852de3c1ad4de720eaeb66d794f120c98c75d4af5f48e WHIRLPOOL 20b4ebb324ea8bda69679947f25f4f537683408c17320bb69ba125d33fcd7b8a330ea4ce366a28a47098928b9a11c7cb7daadf3a53a206bdcb9f40f1c99951d2
+EBUILD nvidia-drivers-173.14.36.ebuild 17283 SHA256 65e6ec84119c5997a7cc664fe3f3697c87e2ab7d64a17b88db044c14fefd65f7 SHA512 bddbdc1f12fd7c35ed7284403ff3724f08236fa4940a8d6a0314530ae68d28d18af695dfaa5a2c337522e79a69d73094a8b1f2dc2cf9ad676def73d8e17b98be WHIRLPOOL aa6fc7f1110d4757ea6fd8d42e2bb69f5391984b6cbb94837e3a960f684c2e6fcdfcc8e545997ccdb4f1f52434106c87f82aedbc8ffc583bcd1f64356b9d39bd
+EBUILD nvidia-drivers-173.14.37.ebuild 17264 SHA256 88c9d1a47a5b18175bacdc54a1fc0ed38d27e07fc97dc9845c30475a8302b5c5 SHA512 4d3d16e59d5684310a9bd027503f50451c048ebd92fb8a2169e877a121fdfdd2337b267b7420fc2472294bfff93ec32cb13e1463b2dfd61d3a7d01e20f4ef94a WHIRLPOOL af932f8e51eb1b27a16390376a1ab184738faace57d93f1cf704bafecf83279a4dddae43bc7ac04ae2d4691abb5771dededa3c3584fb047b91c92af614ee592e
+EBUILD nvidia-drivers-304.88.ebuild 13306 SHA256 813302dc133e2e77f6a6403e3d3ed8c4a17f5743351e0eb1061f9cf7d275d220 SHA512 275224a895e3de49a0af1e5ae2fa6554555aaa33f672428f33aa4d674e96d8097e393225f4a332f79a9a061108d15c72d6ee8331f122c0603b034424bdb4c264 WHIRLPOOL 63f10dfefcfccca077e672360bbd851896d24be82aefc1c2e5dd28d5011f2c7089dedc6e41a760abc3690f3421eb836cf4f4fde95ce46bee994a02d6d04f3a7f
+EBUILD nvidia-drivers-310.44.ebuild 12896 SHA256 3987e83f1b1703e9ee74e425124ddea2a7d11f1d4e81ee4d2eff46a8f6718d8f SHA512 1b258f38aedb84d3644714f8be7667caf7a0d7e9d93a0a915e87bc35503a6f397071262999a7ccb292d69ba26fa9d4027b0edd0c51d088ef20d36de9c586ab66 WHIRLPOOL bed659779416a9c1958b5bf7a75997340616921b5c448efec8fd73f85503b44a5a81bfd703f6dad0b62c0374ab69ef2264cb84bd5b9138486cc75f451f942e61
+EBUILD nvidia-drivers-313.30.ebuild 12834 SHA256 797199f9d7e363974a6a109804ea76466fafec2d509c2f86dbefe5fd7aa9d8a8 SHA512 baca94666f767f740a58ca6e6b8389587184a06bd61feaa81881753112e3afac5083de85d5b7d5d6e238eba3df98c6e81625b41365086713bc93e48e47d46d40 WHIRLPOOL 3d0ffd6e61cccf34065eb45acb298fb50ddad632b9e6df1e9ef22c08cf1eeb926ff83418ad68529a9724fba33def2c7cb1cec2af0238cad2f33502dad300f683
+EBUILD nvidia-drivers-319.12.ebuild 12862 SHA256 593436dce814161abe5f2d648c6f20fef4288dd7791754d2a0f09da7faf78421 SHA512 9949c108e099cb5d866d8d50fbe652b7ab5a44367933ec36c4b74c4201fb7c6ef10e108c6b6f079fb9bedf5157d6562202c873d6ea29d80c17bff99b80aa4f03 WHIRLPOOL d976b146ef273f402f237f06f0d0707c82ceaf7c50bb40309adf2392e897302571e163e963ea95348edd4ab560ce5246f5cd13a5959598a88bb3c0a7362bebb2
+EBUILD nvidia-drivers-96.43.23.ebuild 15936 SHA256 95599e2f2d562c694fa1899d4084ef8588dbe9a1b96a07d98de55953c64ee2f4 SHA512 52ea2ff380fc96ab4cb59e86fe3bf3756285717aeeb92c4866e53e8063e56aad457dd3dcf93f9ff8d2f9646e325975de170d1bc46d5db0a81a17a62b20bbeccd WHIRLPOOL ef0afbb97c4b8708ed1270a0310d1cd2f81e678549d990900f9a22220e88c656d6660b0eeb66ae6360fcc3e12651ade68b3df550832c3e0cbb77221ba7312353
+MISC ChangeLog 94070 SHA256 eec4cfde86ab26a4cef81a188b7172f854856a765536117050bcdb677451feb7 SHA512 48ce26f3f70b4dd91021ff7764377db6d208823d627c0c7b08170c3ec1029ea008cabb1019f9f2541ccfbec78a336f74e8cce4a8f597b43b8baed7c909d7b346 WHIRLPOOL 13b46ed32183799242c8b3f7c136be7545f53afd3b6c46464bfcddea288e7847ca44c9ece7fa447df4218637eeb1ccafec6668053b6220b706f4925d6c9d8c43
 MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFlfFoACgkQVWmRsqeSphPMCgCdFMVYJsHJFS8W4HsEhFWx9Lnv
-ddcAn2780rtkFw4tK7CVE5yWn/p1SwWk
-=CxFo
+iEYEAREIAAYFAlGBe64ACgkQVWmRsqeSphMXKACfTmytRfvYHi2FbkuCxvK9BuNq
++DQAn3+K5pjeaGPzA0jtzcf1swg+oFnK
+=j6ZE
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild
index a58f9556793b..2e385c11f3b9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.36.ebuild,v 1.9 2013/03/30 17:02:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild,v 1.10 2013/05/01 20:31:38 jer Exp $
 
 EAPI="2"
 
@@ -24,14 +24,24 @@ IUSE="acpi multilib kernel_linux tools"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.13.99
+COMMON="
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-admin/eselect-opengl-1.0.9"
+	>=app-admin/eselect-opengl-1.0.9
+"
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
+	<x11-base/xorg-server-1.13.99
 	acpi? ( sys-power/acpid )
+	multilib? (
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl
+		)
+	)
 	tools? (
 		dev-libs/atk
 		dev-libs/glib
@@ -41,7 +51,8 @@ RDEPEND="${COMMON}
 		x11-libs/libXext
 		x11-libs/pango[X]
 		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
-	)"
+	)
+"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.37.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.37.ebuild
index 8e96936b558a..c5411a15e32b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.37.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.37.ebuild,v 1.2 2013/04/06 17:52:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.37.ebuild,v 1.3 2013/05/01 20:31:38 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
@@ -24,10 +24,8 @@ RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
 COMMON="
-	<x11-base/xorg-server-1.14.99
 	>=app-admin/eselect-opengl-1.0.9
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
 "
 DEPEND="
 	${COMMON}
@@ -35,7 +33,17 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
+	<x11-base/xorg-server-1.14.99
 	acpi? ( sys-power/acpid )
+	multilib? (
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl
+		)
+	)
 	tools? (
 		dev-libs/atk
 		dev-libs/glib
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.88.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.88.ebuild
index 72f4600e258c..6e214c6a5b03 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.88.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.88.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.88.ebuild,v 1.3 2013/04/07 13:07:12 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.88.ebuild,v 1.4 2013/05/01 20:31:38 jer Exp $
 
 EAPI=4
 
@@ -28,9 +28,7 @@ EMULTILIB_PKG="true"
 
 COMMON="app-admin/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	X? (
-		<x11-base/xorg-server-1.14.99
 		>=app-admin/eselect-opengl-1.0.9
 	)"
 DEPEND="${COMMON}
@@ -50,7 +48,20 @@ RDEPEND="${COMMON}
 		x11-libs/pango[X]
 		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
-	X? ( x11-libs/libXvMC )"
+	X? (
+		<x11-base/xorg-server-1.14.99
+		x11-libs/libXvMC
+		multilib? (
+			|| (
+				(
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+				)
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
 PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
 
 REQUIRED_USE="tools? ( X )"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild
index 2b7f3e77962c..5201425e59ac 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild,v 1.3 2013/04/07 13:07:12 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild,v 1.4 2013/05/01 20:31:38 jer Exp $
 
 EAPI=4
 
@@ -28,9 +28,7 @@ EMULTILIB_PKG="true"
 
 COMMON="app-admin/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	X? (
-		<x11-base/xorg-server-1.14.99
 		>=app-admin/eselect-opengl-1.0.9
 	)"
 DEPEND="${COMMON}
@@ -49,7 +47,20 @@ RDEPEND="${COMMON}
 		x11-libs/pango[X]
 		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
-	X? ( >=x11-libs/libvdpau-0.3-r1 )"
+	X? (
+		<x11-base/xorg-server-1.14.99
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			|| (
+				(
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+				)
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
 
 REQUIRED_USE="tools? ( X )"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild
index 5d08efc96be2..4cdebdb67bcf 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild,v 1.2 2013/04/07 13:07:12 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild,v 1.3 2013/05/01 20:31:38 jer Exp $
 
 EAPI=5
 
@@ -28,9 +28,7 @@ EMULTILIB_PKG="true"
 
 COMMON="app-admin/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	X? (
-		<x11-base/xorg-server-1.14.99
 		>=app-admin/eselect-opengl-1.0.9
 	)"
 DEPEND="${COMMON}
@@ -48,7 +46,20 @@ RDEPEND="${COMMON}
 		x11-libs/libXext
 		x11-libs/pango[X]
 	)
-	X? ( >=x11-libs/libvdpau-0.3-r1 )"
+	X? (
+		>=x11-libs/libvdpau-0.3-r1
+		<x11-base/xorg-server-1.14.99
+		multilib? (
+			|| (
+				(
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+				)
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
 
 REQUIRED_USE="tools? ( X )"
 
@@ -153,8 +164,8 @@ src_prepare() {
 		ewarn "Using PAX patches is not supported. You will be asked to"
 		ewarn "use a standard kernel should you have issues. Should you"
 		ewarn "need support with these patches, contact the PaX team."
-	    epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
-	    epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
+		epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
+		epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
 	fi
 
 	# Allow user patches so they can support RC kernels and whatever else
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-319.12.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-319.12.ebuild
index bda8354d523b..9a67f4196664 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-319.12.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-319.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-319.12.ebuild,v 1.2 2013/04/10 14:51:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-319.12.ebuild,v 1.3 2013/05/01 20:31:38 jer Exp $
 
 EAPI=5
 
@@ -29,9 +29,7 @@ EMULTILIB_PKG="true"
 COMMON="
 	app-admin/eselect-opencl
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-xlibs )
 	X? (
-		<x11-base/xorg-server-1.14.99
 		>=app-admin/eselect-opengl-1.0.9
 	)
 "
@@ -52,7 +50,19 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/pango[X]
 	)
-	X? ( >=x11-libs/libvdpau-0.3-r1 )
+	X? (
+		<x11-base/xorg-server-1.14.99
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			|| (
+				 (
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+				 )
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
 "
 
 REQUIRED_USE="tools? ( X )"
@@ -158,8 +168,8 @@ src_prepare() {
 		ewarn "Using PAX patches is not supported. You will be asked to"
 		ewarn "use a standard kernel should you have issues. Should you"
 		ewarn "need support with these patches, contact the PaX team."
-	    epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
-	    epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
+		epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
+		epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
 	fi
 
 	# Allow user patches so they can support RC kernels and whatever else
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 f9686f3ecd83..b5ae1a25b6ee 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-2013 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.12 2013/03/30 17:02:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.13 2013/05/01 20:31:38 jer Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.12.99
+COMMON="
 	gtk? (
 		!media-video/nvidia-settings
 		dev-libs/atk
@@ -37,12 +37,24 @@ COMMON="<x11-base/xorg-server-1.12.99
 		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
 	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	>=app-admin/eselect-opengl-1.0.9"
+	>=app-admin/eselect-opengl-1.0.9
+"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+"
 RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )"
+	<x11-base/xorg-server-1.12.99
+	acpi? ( sys-power/acpid )
+	multilib? (
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+			)
+			app-emulation/emul-linux-x86-opengl
+		)
+	)
+"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}