Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug #513718.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

17 files changed, 131 insertions, 83 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 79f6a9ee54bc..10f0d1b78255 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.362 2014/06/13 15:19:15 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.363 2014/06/18 20:58:25 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> ati-drivers-13.12.ebuild,
+  ati-drivers-13.1_pre897.ebuild, ati-drivers-13.4.ebuild,
+  ati-drivers-13.9.ebuild, ati-drivers-14.4_p1.ebuild,
+  ati-drivers-14.6_beta1.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
   13 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +files/ati-drivers-vm-reserverd.patch:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 608e331bbb9b..1278cade7eef 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch 799 SHA256 0001fa7f2c3e15ec315f6c963dd428b682778c129250941a849577b8b3293e36 SHA512 a7ae5e7017c9b5a68d112d9a77df40ada722b06aff0cc31147713bfbce2419f9ca8c22b40398ab8b80c86427ff086a5617fb6de93d540af54365c7039cdcfe0f WHIRLPOOL 809c5bf8f0b0381af6a8549c36fcd00e75ff2f571f21cef3f2dec9ea823c65c29db28373b7145f39b9ed2cad234ec3c063407fb7a12260cfe1fe62eb67b5780d
 AUX ati-drivers-13.12-acpi.patch 548 SHA256 203fde1d773dfd16ab91cbecc9aad7d73a630a3c19f1feb3c74987284c385bff SHA512 1db52b5e4a6398d253122d4d3a3db2261396db9e07cecaf64c4edf1b6d8544cafe6dc0c24651de6b243728f8471f135c0c80c4958bb21cb0b6bf71cca7935981 WHIRLPOOL c7eadd81f517a2cb253c36d1ea401c367bbec88a4c7d14a399ce15c3a5c095fb7ed259d31ef8032304576d2921185e3b06aa1a89d7a209f58e3af93748e240c6
 AUX ati-drivers-13.6-linux-3.10-proc.diff 11837 SHA256 24edbb4fe0390d3eea4bf6b76b8bab87e26a5906cc3e273f2b87b8f3c5fc4918 SHA512 467b111e6c18a587c3d24c0460ce3797b82daf029c5f90614ab7e25e813011a54efc31f8364fe96b46bb28361be87cfe8e49a5ff73b5f23c4e8b072b83785c6c WHIRLPOOL de0d55658ef0f2123cc44928dd3e9d6b6f96223e6669bf38060c5bb50e4084433657708462f04db9ec60932135b6451054b52e962d203dc78f330a9ec48ef309
@@ -22,11 +25,30 @@ DIST amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip 122875129 SHA256 93e213e5b
 DIST amd-driver-installer-catalyst-13.1-legacy-linux-x86.x86_64.zip 106908508 SHA256 3a992fb7564dba17a696217dc32043dabc21743c82116a6657817ee8a3a1d55f SHA512 96b34045dca3ad70156500b37d3f06008728ff81878a3e1432060d08e668d8cbd9bfe172440bcb818f01d731d39e3eeccc25396417993d2b9b8985b3b7dc7357 WHIRLPOOL f0e34ccb1a9dfe3cfd9e9c640c3d6ed97a4a3e892b65325a78045653b40d29a78427dc9092d8e14bee1a8ba603405ed9e8cd60188d5bc5e8c5eee03d66a8f25c
 DIST linux-amd-catalyst-14.6-beta-v1.0-may23.zip 127015703 SHA256 d03c524d7ec7154ddc598f73ab2db08cb38cc47b756f0809cda9e21ea1ce40fd SHA512 96ca8898d7255f18a0cf19feb3af7478bfd65ac4b5890e7d7919c1b5a2e0e8eacaa26a3cd804b7ce6448f19b54e8e45ecc168629d8ad35eaa108a019b3907ea3 WHIRLPOOL bcf45b957484250bf4ade52eecfb71ea933fd8c8c3ef248ca7b013430ec8c232eff33317d13a13cdd5d7e2681832b8847cb86d1fe5340dafaaa23a7abf581df4
 DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
-EBUILD ati-drivers-13.12.ebuild 20204 SHA256 775ed40b70bf3d48938873a9c371b557b809c9a77096243c0938bf8261142e7f SHA512 537da8518f9a4134b40aa452e6a0cba55a4dee9684b08ae188156a197672680a3af70dcd114c43ae5343662b2358f7cfae44aaa053bc8c18601027ac63374efb WHIRLPOOL 31a036993dfc6c291940d0b08922ee8945568279b2c554c3b858a5e9d1fdba6cca4389b326609a6595fd7febf76f798ecd40f740bb020b73dfe1ec812a60ad2f
-EBUILD ati-drivers-13.1_pre897.ebuild 19982 SHA256 b004303b1b12563c365d0d2f643bf892092a9262880176c26d3542d9d206dee6 SHA512 9045276558ac065a804a25ae919ddb129ce939c621f3eb61291065729826d99e9d2e9128c47db41f1030552b8aaace29730552420ed03558478c83261aac5e86 WHIRLPOOL 38f437df20b93c0c83f271ab56c7653b356ae2421a28d7a2bb7ea0c3d73c2c3701892a4317ea125dfe447bc9737e9b8369fa1570eca20f5510bf6f21e357f67f
-EBUILD ati-drivers-13.4.ebuild 20497 SHA256 5524e85d6ff84c8c8b1adda8e84be281ac0aded52d5aa6775e7ba1760575817d SHA512 646fc2e0657c12521e87072b8870d660726de337ac35b963f7b586b95032ef2b4082814f966e138febfed75e8b7df8676c7ee998ff16548b0c39e62cbe7e8cd2 WHIRLPOOL e9df25250e4dab82a11eaec0cdf0bff83d1b8360d7f79e76df2603ebec0d3387322be2474f233bf04b2b45d2b50dd22a53cec473a1213db635c4e0c3762c53e0
-EBUILD ati-drivers-13.9.ebuild 19867 SHA256 788e43c18d3f838235995edebe0d62f6ef0de1742debfef79091bc6de9d8c08f SHA512 dc970b56a47ed8d562b3803d1c47d148cd464c293f1bef7a7a0a9b80290467218b30de54f541e2a557bcea75ed77ee5fe93688dde615f86d443709ea0b897f36 WHIRLPOOL 131fee00c0aa468e9913010cb84a02ecb9c6f6191984d758448d5acfaff3eebe941cc0c5a97a4bd224c61287b54e89e93038483a88204c840ee88abebcd672fc
-EBUILD ati-drivers-14.4_p1.ebuild 20315 SHA256 be966dc3125790b2d9e9c8a3595b516b650159228c931092aea1aad74e715a1b SHA512 daaf533123b458dcc6204bdedac654116daed7b0879911401612e1b218e57920eb889f433ff46d01c0334d270a479ed446680d737db2c5e1397cbe72b67b12ef WHIRLPOOL 296765f85537189e2e3a9b2e39c17674a60728ec1548c9078d36f28a8c95fa02b49a015f39da2aa762f1b7576d027367b47b592d919000df9957a446ff096c1c
-EBUILD ati-drivers-14.6_beta1.ebuild 20295 SHA256 647e79c7611e51d5994a61e1ec86d07db7dbed94261ae2d55771666cb1c80551 SHA512 5e144ee7fea459b351b5032538cafe6d4180909dfa6aed23789e1615950bb32a3e6001a5020b3d16fb87acb09bc9e83a7a7f2870c999ee692fc6e2e57f3e48cb WHIRLPOOL a9a13ca7d34a1d1eedd8b19790f70507da5dc74ca815033b32a64b29923c5dc1189fdb160cc087a99a35aed2ebc799b346558e02f2b99f21cb75e13a4a7b9050
-MISC ChangeLog 93428 SHA256 eae291cade47772e45f3895e2fa3973a37544854992d65bb6cdad3b14fe2776a SHA512 be109d7f36cfa0ac4c21a1d6949d51fe6f8d2a25e351ed6cd90ce245b4193f219ad8c3937b08237daaa4c961c599ab927944205e50daa01ed95aca164001b908 WHIRLPOOL ec3f4ba70a656f20375415afb24cd76821d027816ccf8283851e2386ea15d9bfe83316740011bafeb717351a8ef78011c58911f5221cb857aa2ea3c29e7cb0d4
+EBUILD ati-drivers-13.12.ebuild 20247 SHA256 253b3a23afc94c54bbd14b4a67cff2822fc98173d06d16b5ddad773a947becfa SHA512 889644c7797dd47e6b13b06148330823f2a55b79082b0b9ae14fe659186377d41fdde44342ea56328ae8a5288cef25d3fd3b6d3987158e5b3c7891184f3a285a WHIRLPOOL 29cf592352a14af099286c927856c0aeffa3b933b4b61b634c252879ad14aba2c177f48b039714a9098b56a614f88ecd95f6d115bafe66315d322c76b89e8a11
+EBUILD ati-drivers-13.1_pre897.ebuild 20021 SHA256 3dd2f798898fb28e1a7e9e5827bac02f9a113ae8de27924eada6bdb8419aa982 SHA512 5e2fb809e83fb35a170a1562d9b952d847e47f028b3423924bb761ea0e2f4184c10a34f51efc3dab0e581f33aa69ac7f353094fa1cf1cb44cf41860911d75db4 WHIRLPOOL 434a619b8ee8574c3082dabf342539e244ea5dfb4bddb513c76648d27a5f00314ee68b4244b4dbafc5a2609df1874f7c8ac54cc83993f4bf64a7923d77e4d5a4
+EBUILD ati-drivers-13.4.ebuild 20534 SHA256 c6b7fd243db98708e02ca9a7234b17b6c10be8da7eee4de75257c70836c1ff15 SHA512 6f1f4cc4bf0d13f3c9f69f1036c39286fdd335de114f03efa76c75c6988b273d0dd6b3293fd1bebfdca033c21b32b2d1bdf0a6ad273ab4fc33cf270882e9669f WHIRLPOOL 94a234a7abdc434fd7980cfd7e0ce27e2ba4d7fe5f9d51dec748d0f8966eb87d40d5295ea9e443af1b8d2e21fda809091b0e9ab79262968cac1538c3f85b0a33
+EBUILD ati-drivers-13.9.ebuild 19910 SHA256 2a566cbf5a61e2a1bfba73608aeb366bd28dec1064ae6c61aa6f22b2bd81c60d SHA512 f7720b9e79290136fdcacdd574a9bc4befa88e25cbbdbcb1f600230471f4848aa40e221877603168d5dd9877a4617ed2c45c04c8a85b96f9ff6e8dba8ab2ef6c WHIRLPOOL 8fb8811496b053297f7235cf78a3e44cde5d7ebeace56878d2e234ee79660881ed9678b501250d9e74ebfd8162dc0650476cf74f057779c24d57079a859517e9
+EBUILD ati-drivers-14.4_p1.ebuild 20362 SHA256 8834adb4d90edac9b4c79f6b95f2e4ba508fa201c524663ea80041cb63eb4d62 SHA512 604697ba73ebb27f788b69273b36213cde78521f2d46c2967ee6ce68b4ec684e47fd2b3e23e25ad264e0adeb59a677a54f86dc633834e0fbe9b95207df973741 WHIRLPOOL 3213dc6b3e00073f4f8b4821c16cbecf5f690cade7d6176ca6d12488113d01674853ffa8512500b98079da649f3efe4f32206fefaabf54cb94abe1ca3cdde0ea
+EBUILD ati-drivers-14.6_beta1.ebuild 20342 SHA256 15938003337f78211469aebcbf6f0822dc0cfb39296ad5c411eed365f7a2f6e1 SHA512 7aa1b2af43fa67fd9f52e4e889adfc374182d2be07650a326f960b480e708638bdd523b008671be02d7d436728ebaf609aec0200598de29a042b407b780eb1a0 WHIRLPOOL 79fc8c92bbc4da8b9159add6d77765b2bbb7508ec9bafecca5d4660914a3b71ce4a27d27e5216cecda8ea967099f4e187bac01dd8376b7bb72e5dd53e960af19
+MISC ChangeLog 93737 SHA256 291304ab6816710eef95e929175020d1476d01fcf2222df7b33369fb32639a46 SHA512 1f4d9944287236afed57a462322ebed20caf0ac166b200a08ba8b1f96a2c13ad80372d67bf4c48062bee4fa2e35cc8ee5f66b4a7c8f8ffeee1d84ee8cbea4b5a WHIRLPOOL e2ed4703fb1aceb3948a320e0e827a18f1cbd9cb011619a61787d523ddf45f51aab1393d63732251b58efbbe4d6081d102c6c53e51d30526c7e523a8030c1b3d
 MISC metadata.xml 775 SHA256 827539e024f84e38b06ca3ef03d2c1938a14f27f1556efc76bc747a006764c76 SHA512 87a8b404a33c29a63a685482026ffdfbb92556f1548a2940918569a3d0272d68d06496dbbbe414e4c8d42c5b9e51c32f55609fa9cf209a4e9ddb7d1613e34a79 WHIRLPOOL a69a2f49a3879d349947a399b306b084328daa025d95976e6223c2e2269b1e5f302a68f3e299733073aaf6b2743a2ef7f81bbe5f4016cf8897bc4226c9b3d477
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJTof15XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1RwQALOOJTbR6l3sKCps0hhw3yyM
+4O7OAC+l4ui3D9JJ4rACNxC2tNEHK4NNb4MBk1o+FYmwL9hQ0G/mW/j1ThNVlgZ8
+u2l7PXlX2nnfJPC3oFz0ro2p+H9eI1VHbLSPR14iwlJIMB74kYVbyQhBsABvTziI
+NgomNlZN6uAn6vnXk3CpkU3uDK7KqstbZbkGlFPF7C0JgMfTDM+wxmZTlwmeCUYM
++UFbm9Tpi1avqhw8o5WHZlYit3i9jUjp+mqBJa8x/1Zk5/Pl+EQoA1mWzW4cOrKb
+2Bnr9b63LqhVq5OpNcgJNFYHB+AD+vuZBphPyU5FZfmS9MzLNF4ZLVRR2YAqfN8z
++gd0ePRDUGhETFG0UlI5OdbSwSBJYwppqiBANN3kQv+P/bI32d8hpUNcHitURLyT
+qnVndrmaV6+Ohb39nV+Iv0Otl3L0uGWl8L7433Ys0SQvZIqGGawse30EEIGOokaB
++PfLPQuv8O4iveR9Qsi7IYAiAgEFyagYTs1cQBG3Zw9Z0kARh+4SaXvE8z3+EQVG
+vehxGHTvgu0xxpCtCJG3ECc2om22FYi7CFDhZIZEgB/xB2sEMHunQ/9MqH0w84ht
+4zCsH8yCe8c8Ub5DQErc5YeDj7tWlJHTUXfkvsjWEf0KMx5jnJjsWVTtuyv2LEQ2
+sLGwVNwOBzuao5gie5WA
+=+pHd
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
index a49a692eaaa2..761ac517a7c7 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild,v 1.4 2014/04/06 10:11:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild,v 1.5 2014/06/18 20:58:25 mgorny Exp $
 
 EAPI=5
 
@@ -39,11 +39,11 @@ RDEPEND="
 			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]
+					>=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
 			)
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild
index 2515ccff730a..efd84ec6a67c 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild,v 1.9 2013/06/18 14:00:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild,v 1.10 2014/06/18 20:58:25 mgorny Exp $
 
 EAPI=5
 
@@ -42,11 +42,11 @@ RDEPEND="
 			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]
+					>=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
 			)
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
index fb4c8c018d5f..947b331007e3 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild,v 1.6 2013/07/01 18:15:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild,v 1.7 2014/06/18 20:58:25 mgorny Exp $
 
 EAPI=5
 
@@ -47,11 +47,11 @@ RDEPEND="
 			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]
+					>=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
 			)
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild
index 372b37ddaf72..3870c9aa2455 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild,v 1.3 2013/10/08 05:05:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild,v 1.4 2014/06/18 20:58:25 mgorny Exp $
 
 EAPI=5
 
@@ -37,11 +37,11 @@ RDEPEND="
 			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]
+					>=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
 			)
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 daaa3cd9247b..351be120b306 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-2014 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.2 2014/06/02 13:33:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.4_p1.ebuild,v 1.3 2014/06/18 20:58:25 mgorny Exp $
 
 EAPI=5
 
@@ -37,16 +37,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			|| (
-				virtual/glu[abi_x86_32]
+				>=virtual/glu-9.0-r1[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]
+					>=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
 			)
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild
index 43e8597df99b..661935edc31d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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_beta1.ebuild,v 1.1 2014/06/05 13:49:43 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.6_beta1.ebuild,v 1.2 2014/06/18 20:58:25 mgorny Exp $
 
 EAPI=5
 
@@ -37,16 +37,16 @@ RDEPEND="
 	virtual/glu
 	multilib? (
 			|| (
-				virtual/glu[abi_x86_32]
+				>=virtual/glu-9.0-r1[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]
+					>=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
 			)
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 00850d031478..95d3d8793b73 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.558 2014/06/16 00:29:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.559 2014/06/18 20:58:34 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> nvidia-drivers-173.14.39.ebuild,
+  nvidia-drivers-304.121.ebuild, nvidia-drivers-331.79.ebuild,
+  nvidia-drivers-334.21-r3.ebuild, nvidia-drivers-337.25.ebuild,
+  nvidia-drivers-340.17.ebuild, nvidia-drivers-96.43.23.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
   16 Jun 2014; Jeroen Roovers <jer@gentoo.org>
   +nvidia-drivers-334.21-r3.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7212a0289afd..47dbe18e4c48 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -40,20 +40,32 @@ DIST NVIDIA-Linux-x86_64-334.21.run 67906887 SHA256 dd35011967b815e096c267f80b36
 DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd
 DIST NVIDIA-Linux-x86_64-340.17.run 69668217 SHA256 b3311d4bc82dd1c58805f2ac29d20711f2b0c0978407bba138d603606e603662 SHA512 82bc5a7961f4bb96f55811bb550c1ad3a2544b63160c3dde9d4864dd3efe7aa95a15c0722ce759f6dc223298a38f2577ec36b651c5faa00e8a9360c30e92813d WHIRLPOOL 21e7c474c457d16b99fa0081a3b0498161a7d19dfef2918a127f49e0b4528d1ff86222deb099a486523fbf48408f34f600bf50132ac39eb62222d65535d4fa51
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
-EBUILD nvidia-drivers-173.14.39.ebuild 16614 SHA256 ae887bb6ceac7514c08609cca6776e773d0511555a006e9bde8892bf040d6153 SHA512 bbfe1ae7c969105039c04f895b22703f093a0d7f81a60c0d77723566d0f0cd76edbecb8af1627dbb0d0f50ae27f9040fd703413c973a1e4dfe49620c2cba3194 WHIRLPOOL 0351e366306c958089c5035c9901f0ddb7fdfef54e314ce2f2ee0b8c4bc443827dbdc35ab53f1501dfaf6c289fca412b0826388a38925ad721cef7c61eb0a4fa
-EBUILD nvidia-drivers-304.121.ebuild 12593 SHA256 8f889a4e51dd37e2a385831a05b852abcce6d7cf6b31faea62bbf9fe9dcbd3ce SHA512 f35368b850cdc78106ecb0cac6a5b9c2f3655111762965e7f8189f368f92b1ad5a596692c8556b61350e53c90e498dc8367ee1c1d67dac73e60fde37f3abd0f3 WHIRLPOOL 7faa5e0a3627c48c9168fa7056914d7338dd233436aa8e00b94c04d89818c11ddbca29e4cf57803cbed688df1de8f14cf84b4c7f104f57b3fd82f6b4fccf2349
-EBUILD nvidia-drivers-331.79.ebuild 12969 SHA256 2b940dcbf91c85f862e35a4cb317d88c5fdc5ecc944dce189f2c6b207e294dad SHA512 8dbff47b8cb59d71493515b5e2288f98616f62d00d51e16dbf4304f075d451a5ec53540e647021d2a2edfa21e74c4a04080da9ff4c5218937769fa3cdf078443 WHIRLPOOL 472a12390476c4bc029fb17e41835d6e4a42c4cd6dba0ed21c294e3136205596e24d38b7bc8082e75730cc984cb24a88791aeee1169f4d89441c686f0c82b6a2
-EBUILD nvidia-drivers-334.21-r3.ebuild 13248 SHA256 ff18eadfc4aebb46c855c91552f04f9ab90d8e07e3b12cc56a3bf138c8a9f202 SHA512 b87e6d1cc3b211157a8572e5eac3fc483d99169890089c2c53192dad995aadeb24a518dde272de04e35fb52f8175c0efa520c9e1388989673d5df72aa1065037 WHIRLPOOL d6e7f61fdf0586191077ed01f11428f96e8665ddd7b25ebc168317780b9324d79d06f0bb2bc81ade4ca3c990c0fb0e57b5898300db819975e3d1eb0f9075ad4d
-EBUILD nvidia-drivers-337.25.ebuild 13251 SHA256 473684ece9b5dc33f64fe446bdf81e2efd08a9db770354bb6b366c943c91e7f6 SHA512 71f8fd6102ce55944b79f3e2e0bf283ab9e49a6e2b19a8ccae946b7fa1ef5782c68044052622fa8f2aa1d0c82603b5355cab79ff288efd0f73ef8a2cb85ff819 WHIRLPOOL 49e7b10c7b2f062b382574bf76e61399b7f920a14e86b7f64feb3b2c08680fefb4e02e2be27947c556b88d2562e859ef6ac23e7214310e91201c57d804667862
-EBUILD nvidia-drivers-340.17.ebuild 13253 SHA256 c517d77b78e0b0a71c113a6c7e5f6006691ef2dc007c63edaa8dd66b3fb91809 SHA512 5ade9485a13cf8d65639577d5c08b438618a379fb6f5c62068f17bb10b9087ab2aba4777a2a4a5f24a98f50f82addfcb4bf5635f61d06b35f9dfb9eaff58b2a6 WHIRLPOOL 38279f30a78069c337af425908cf4b4d5c531f5939bac0f4eb89bf369a5fef8573c9283bdbf2479517d65085545b84e0e2f378c25fbf8d8d62e6336fac0827c6
-EBUILD nvidia-drivers-96.43.23.ebuild 14881 SHA256 d10341d00b552518b6cc075552b958d9f6bdf9237e28bd4392c17419d52190b8 SHA512 edbb8d34b02db54b071abaa977cd5a1adb2650282aefcf31bc608e743ae0f3c68d4c1c420b729b80bc2321b6f2b720ad666448b0d6b3804467005a2ac06091ed WHIRLPOOL d786cbf75263aa70d4cd66bea752e607ea4b6511ad78e970bb22e15c7f0ee38104ba85398dff7e72e3781d79dad9a2e4bcaacbb5d64da39e8b702cf9b7af827d
-MISC ChangeLog 8616 SHA256 3f967028674d58b5c3dcd255d6f6c7169b6f0d4feca2550be72c10040ecb1328 SHA512 2da082b7b703c987c7be7627d32b28e187b1647b26321ee599bee59ed6456e94cca7b0e26548fff2b22b8eacf4eb6abe13eb768eb181e01dd3a9e6377986a62c WHIRLPOOL 6706e3c455ce0ca283a67c40c8f8e8ce0ca7ee833f96eba2e0441ea1b55153cd4e6a5858f3565ef12e84e577555ef8f6b323b6ccb97a1c07590b4acdca3ed8be
+EBUILD nvidia-drivers-173.14.39.ebuild 16633 SHA256 544ab6b35347cf0043fd7489d6cfce2432e87c22f209886edc6eff9a68c57908 SHA512 044c5caa4a6f63c16665d54652c24b082eea4caedc8337a3942d6fae03c22438830a0e3d45a0d6de7e6fe6bc5069e8110c2b6172581071666026b061a2b05d39 WHIRLPOOL b117b6925b02ca2724b325a959e4b7694a404d363d14c3b852f8dee3c82d6a8b0be316601ccd209cbd2cb5d06d34a1d792ff2c470a712071ba301025083ff063
+EBUILD nvidia-drivers-304.121.ebuild 12612 SHA256 f60bc70d21e991b2dad4cddfc24a372da77a3726b3c614fb958cee08694b9b3a SHA512 3f5a3952d4e186f8ca44f5580f8cdf30a3a0fa5e0705fdb05f3c3b6f36f3ffaaaeb077e7776b3e71b3aa5b4757013ff79f295238f54841189d3fa227fe65b68d WHIRLPOOL ff8fa71cd4563c36ac7c8e5f333465ecdf0525b935f3dda4f8fe790ac3e314050dfb3ca57232d70487d9ee3ab607e0ba0db4cc7fbf2d5fc12e2e5505e496135b
+EBUILD nvidia-drivers-331.79.ebuild 12988 SHA256 c116ec0e91e6acc0e3caa65ff37554b134d2001fe86c83fe8457d60f2c9cd4f5 SHA512 0d33f87f3953ebcd2c0b9b1619405430dd9addee3daf9f819b93699d7183e9b006c523368a0943a1f4bc29a1e801ef58704570a3e70dad611eb098238c5cc219 WHIRLPOOL 480732335fb442f3063bb1b76d81f38533a3004e8b25b7297aba2f698e609239fa115d155b769dbd89449bcb23dcb5e361d80788fe3e5def2588b07a13295f27
+EBUILD nvidia-drivers-334.21-r3.ebuild 13267 SHA256 08c3728f46c0521bc238b6a411aacb14b72159a8d240454036e90d6960a4df01 SHA512 93760aa937532c48314044acc9441ee37b48e75e22677d81398144b39d2634664cb064ab091ee71575463a1cc35f0f3c82cd280e07fbb86631bf97371561be23 WHIRLPOOL 80fbcf80d07e94fa0f930a412a871b2f7ed08a5867bc25598a002dffe70b69194570a8650fa4f44824ea7ca3bd1747a5c1a9f5315ed52e2048d4cdf377bab6fa
+EBUILD nvidia-drivers-337.25.ebuild 13270 SHA256 68d303a082649d6225de71cb6f269081418bc43d8321d38caab6d9384a817f05 SHA512 3796db6e9b95b887939ce003f9473b192492b0933a27b5ffb00b5a073c0f2eb98ba20d29480c2092a78c4dfb5753d28dfaeed3479ba4e164ca894a8a5d38cb2d WHIRLPOOL 5da352f14226e79bc4c20e387df439d7abd72dc457448b39ff4491478d87639d490779c5b19e49d5c8a085dd08486f67998d176d0cbffa9e4408b2ea929eabef
+EBUILD nvidia-drivers-340.17.ebuild 13272 SHA256 b4a440ed084d3e1180389dc76a36a60dad2f095275a869a1e3f08d068bc00c74 SHA512 e9d0229a843778d587ebaef90696b5472192c1c8188bd55de7d996e1212e9c26b58c092a3601b0fcdcc0905227454f16648c3691e6fbfb5906cdea3a390d7830 WHIRLPOOL 4b994fe97d028cd2b2b074b88c99073ef4949674c9c6c444bea31c4b44b8a5fa1458d5bf3988c95f3fdac8a5bd0be1b41e101151319ce4fe09b457ab32a2d1fa
+EBUILD nvidia-drivers-96.43.23.ebuild 14900 SHA256 5c91c2cfe129887c8f7c6b810da0a19b95c732fd9bc0bfe983e8217b10c02e73 SHA512 6eb6d56c35dcbc009a1d59e28cc2a43b83f713ba6090efe60878c4ed76d316f51fab5a97893691b28908c3eb9618d53c2805e3d22538277825e9d9e13ac8ecbd WHIRLPOOL c3dc75f852b23b967490032280110c39e96b6141ef051b82003201ce99f7475ebccdeb109cdc318d39b504d8708bbbad73fe458be4a808398ffabafbdfd02a69
+MISC ChangeLog 8982 SHA256 8736b64c6ad118f85c71714b91352b394d5e7e3e6aeaf811864effe6ea33385a SHA512 4b275ec3ea0f2a1f6f50a6d4aa1d1b03bad88b3947551024077b85a0f5bca60d6d02b6b33890749913d4cc679f1062b1d475b5694488a1d9716b5e176481b115 WHIRLPOOL 102aa013a5bc84d1d1852745c2ef4e845cfe8f249b0ce8667e7a3b73d3451caaf053d038a910133d04a31ce2f35cf1909b7e6e8e48ea181a42630ff2323ee0f4
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 591 SHA256 1b2f8667e5aae901fd45390fe287245faf07dfaed57f7243037c290c01db3e4a SHA512 8a4d1e029a0c7633244a1853fc26b2ea31608aa13f947bb453d99bfe8e0937d46e8abe4c0704382a992a486d92f66bfd5cce7406a0f129ac97ef1fc0b602e5df WHIRLPOOL 3061925c0c8172c1bab032bc79d664668921682e5bac4b926b17ee5d15357a6eec959c7f8618a97fe3e181ab1229baf500400aa4ba3480d3373dbdc3185b9d80
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOeOnkACgkQVWmRsqeSphOuOwCdFyvLH0/PxMyxDrRhRxH7GGqa
-f14An3djmKKnNBDz7eI6iXjqLof1g3YR
-=n96P
+iQJ8BAEBCABmBQJTof2GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOne0QAKLG2UhkA8VC0t6UgCL/u5vy
+LAdp1AR/jvESo3M13EYn6LR4DXdu3er5feAA+0OUUPYNExtBIHLlZprIKK4n4qPC
+lcbL5EzhUX/hKAQiVeCBbH1pnhFoEleJYzGfrb9WIuRDnX/aFgEMUW6HhpOOAg+C
+pOMGPNBs7tlMGrLjZ0pxK1a0IpaPjtAwYtXCoi4cMD++cu7hP4H/qThhXd4GAnCf
+bApCnp5OyBWvCtTXBGeaTkHkDC59AOoVxTkKAM3rPURviDQTZ/bmb21FkkHpmrYn
+bY4b/qFDCUlpSX3FMAMhnaTUlk5CMuX8Ht3lbpV79EfbS8Z9J1mHQVq/G5gGXc3J
+RLxFN21NYNfqb81ZIQlXxtPBHCPQxLl3vmV9d1yLBrnezWK3cNnkSvCoE7CXYpm3
+zoPMlhHU5Fz/nVgo9qo0IiwUIUFnQw9hKVSqF/+cZS8DqAN35/kamwUloxZC+T82
+/OBDcbcmiiw5ziquXy4ikdzvHS5XZ1nj8vEaX4WrWDzDAPGWuTtTSXJY7Lx5GCK6
+xl80RbF6h3KrDzIYxVnPsuVWy4F9C8l3brBxA4LikMPG0TdC4AXwuvfsmmiaoYBZ
+sEZKK+G09qFBH935anAYq4o6x+YB0ejbhBEjSJvlzQ3fQ2WcQ9BM2R06TKo74gQh
+GfUXKWw3542jQ7SFyrBp
+=JPRr
 -----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 f2f03ed11ee2..1b497665408b 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-2014 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.5 2014/03/31 19:03:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild,v 1.6 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 
@@ -39,8 +39,8 @@ RDEPEND="
 	multilib? (
 		|| (
 			(
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
+				>=x11-libs/libX11-1.6.2[abi_x86_32]
+				>=x11-libs/libXext-1.3.2[abi_x86_32]
 			)
 			app-emulation/emul-linux-x86-opengl
 		)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild
index eef8dc855a92..c6fd4825a39a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.121.ebuild,v 1.3 2014/03/31 19:03:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.121.ebuild,v 1.4 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
@@ -56,8 +56,8 @@ RDEPEND="${COMMON}
 		multilib? (
 			|| (
 				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
 				)
 				app-emulation/emul-linux-x86-xlibs
 			)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild
index 177dd486ce40..b658dd984853 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.79.ebuild,v 1.2 2014/05/29 03:43:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.79.ebuild,v 1.3 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 
@@ -59,8 +59,8 @@ RDEPEND="
 		multilib? (
 			|| (
 				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
 				 )
 				app-emulation/emul-linux-x86-xlibs
 			)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild
index 7a22381435e4..08b30a421098 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild,v 1.7 2014/06/16 00:29:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild,v 1.8 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 
@@ -59,8 +59,8 @@ RDEPEND="
 		multilib? (
 			|| (
 				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
 				 )
 				app-emulation/emul-linux-x86-xlibs
 			)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
index 2d02b7f566a8..bfb2545a07a0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild,v 1.3 2014/06/15 14:35:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild,v 1.4 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 
@@ -59,8 +59,8 @@ RDEPEND="
 		multilib? (
 			|| (
 				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
 				 )
 				app-emulation/emul-linux-x86-xlibs
 			)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.17.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.17.ebuild
index da46097ccf27..363ed50d3ef0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.17.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.17.ebuild,v 1.2 2014/06/09 15:16:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.17.ebuild,v 1.3 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 
@@ -59,8 +59,8 @@ RDEPEND="
 		multilib? (
 			|| (
 				 (
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
 				 )
 				app-emulation/emul-linux-x86-xlibs
 			)
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 5e16b9dffd11..d570d6649adb 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-2014 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.20 2014/03/31 19:03:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.21 2014/06/18 20:58:34 mgorny Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
@@ -46,8 +46,8 @@ RDEPEND="${COMMON}
 	multilib? (
 		|| (
 			(
-				x11-libs/libX11[abi_x86_32]
-				x11-libs/libXext[abi_x86_32]
+				>=x11-libs/libX11-1.6.2[abi_x86_32]
+				>=x11-libs/libXext-1.3.2[abi_x86_32]
 			)
 			app-emulation/emul-linux-x86-opengl
 		)