Version bump.

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

6 files changed, 499 insertions, 38 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 25826f759e6d..a1333b269a71 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.545 2014/04/08 20:02:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.546 2014/04/09 16:05:24 jer Exp $
+
+*nvidia-drivers-337.12 (09 Apr 2014)
+
+  09 Apr 2014; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-331.49-r3.ebuild,
+  nvidia-drivers-334.21-r3.ebuild, +nvidia-drivers-337.12.ebuild,
+  -files/nvidia-drivers-334.21-linux-3.14.patch:
+  Version bump.
 
   08 Apr 2014; Mike Frysinger <vapier@gentoo.org>
   +files/nvidia-drivers-334.21-linux-3.14.patch,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9265cd2154d9..1809d2b5ee7e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,7 +7,6 @@ AUX NVIDIA_glx-defines.patch 437 SHA256 0007f3d962edb87da4788ce58869679c1b10f282
 AUX NVIDIA_glx-glheader.patch 380 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf SHA512 366ebbe967001f4d694e9d6ae61fbd8b57e2946bba495894936809634bb87bd6ba6b10689969977e4d0eaba6983c16fe8d78830112b5b28f01c78381a0a095d6 WHIRLPOOL 8609fcedb439299189d9d05606a290a63de8b207bab855f874faa36e892396f41159d26e505dfead89fdac9d7e61aeeb50b16877aa14ad62dc3cd617353d7d60
 AUX nvidia-169.07 639 SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f WHIRLPOOL 626ae3c01c879e0cfe05bd373e0b9dfd6f462dd9ef6ae94a7d60276fe2d17c57fbb20aaa4d2a186a0ffc2a860076692aac854d00a3545bc9736e7bb8d0581055
 AUX nvidia-drivers-331.13-pax-usercopy.patch 2127 SHA256 669ffcab77432f116c2b9bc7ed55e2a1f4e208ff19b63d43003af2b346f7c0c0 SHA512 c6ebd534d1e88fe5c1b71ef5ccced8957e34931cab72d1adb4017c703fc2e285f6e36a778bb36a319f505cfe6408be098569944aa5d78c00c8837ffe880d006a WHIRLPOOL 798d3f3edeae2361f039372f5fe13cf9df5aef20ee63c7cdc83e806cbad097b0ddccd6b30968c2b2ceb768ad0425b02aaefe1ba41709e3f0fb79a82f908579a6
-AUX nvidia-drivers-334.21-linux-3.14.patch 395 SHA256 558afe00ad5901cc5c34c65f1bedf4866f24bcaf64c9ce5dd3332d5681a69cec SHA512 820cf5e387a7c823b1544babd34547f5a7896158d940064576c7b643bf71b7a1d50622aa9734568e0c90286a2a9e5fb373048a7e15885b336d96d4a68f935d22 WHIRLPOOL 000984e8976c5aab5ef20a556d78a06e9accd7d8a4893240d9a0a8de4f92cef09311ec458d91511590be7a07cdee393a78fe745196667c7ff85df6caa09ce6e0
 AUX nvidia-drivers-pax-const.patch 833 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 SHA512 6ef94db71cab2dd47273eaed1857209d03ef648d268c7645f3ca4caf6b894590e42a8e716e4354f2eed656e7d55a4c1774b1e6a4be215fbf59fc9d0b1a5762a0 WHIRLPOOL 1b2d737ee7ccee831c85bd8af9605c0633fd025bb209e6d76c13f49a5664aa490bd5b6ce48855e541fe87380cd7b723162e1965b803e1ed630f239bf4dbd0d19
 AUX nvidia-drivers-pax-usercopy.patch 2350 SHA256 56980f43db38d582bc6a9bfd881973fce6e3e056b77ce4f4005bdcf79526a863 SHA512 54a1354ba008d014a608044610027b4d808120f8e77cc7d5ac855c3dcf4f487b0a4c0870ae4e727db0643cb56ee21513b803976e9a30c6838adf2f5414232804 WHIRLPOOL 78ac54bfe52cc3b6dfa28e17020991dfb7056984d667b0fefa41d23372b03e1a8e6d66c74e1dee234733d5b2b36e2c0813f507a89716ae2d8f1f6db917fdf01d
 AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b
@@ -19,44 +18,39 @@ DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace
 DIST NVIDIA-FreeBSD-x86-304.121.tar.gz 33977409 SHA256 980e613a5f969741f15ce8b87077c3b4343c72f2762613bf96237ba11d963ec0 SHA512 e031d7ce8f2db917a54792792901ce46d9a939bd818ed5167b5dabf58d102b54c687addfb083283db3091e54bdd71479dc4d87699be22abefe65662d93c4e49f WHIRLPOOL facc59cea0ff57819dafb9465b697d34b1f309ef7b4eae072b3af93ff64672845b747de57a77bb66fd62f224df4cad85b97efbd6ff79726ba51995abfe7f871a
 DIST NVIDIA-FreeBSD-x86-331.49.tar.gz 55867593 SHA256 0686d20e647553f81afebc646b135b780c510679715344547ecc9244aff18cca SHA512 d688710fdae7074600866dbfb7554e59e7c014d539e1bf2e638c131aa2c3b111c55cb09117bd05d1d88378b8f3af09ba7d75ef06c1af1749ab72d4b02058f075 WHIRLPOOL 3bf5a144a8ecc6a2ffc350e2efd6de5117bb42f7b2e3448f62e33b30f0213c6c6463b016fb8d978e3c921d663bdc7d0914977863ad72b3fef31fc486711a4d73
 DIST NVIDIA-FreeBSD-x86-334.21.tar.gz 56975582 SHA256 ddce7f8e23dd4070c53c7239ce1436c07e28a8bc9679fafba6748038767e8648 SHA512 9e421cac504f075bb80501e7815ada27182c66e6bc22324595da1824b49c00fc8b005028bd9f5d0428f0d9ee04af82e1c90bf1f6b77cf0d60b90dbac963c544b WHIRLPOOL 1ba6573f67be85efdc656063aab8d5cc9a51eb455946dcfdea1b368879d6279de214c7554359bfa2252925f338d597ac5178593f50cc073bb66bf952beffce5f
+DIST NVIDIA-FreeBSD-x86-337.12.tar.gz 58111807 SHA256 e5156f1dc9e5bc35d76792154ae2e43d82f465d104398574bd7702ac4916e4ed SHA512 13ab2406207f983308279cc182f017ace23af0c070d8efcbe4319e174c6e60a6c9b76adc4ef20e80a5848634bc90859fe72318bea3255fe13b7839aef646e075 WHIRLPOOL 77246ab2fa8caf29efd29d8b2ec70647a5a5e15980fa76ed3f85df389726d8343b97efdb71f86bd9e0d7154256afc9b706d159f36ec14cf6f0c2709679272928
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.121.tar.gz 34946870 SHA256 91fd8f924b99682c59f96e1b4513f8d2c51985fff743c8a448861b536955e2e9 SHA512 890a20aa82d16197a5633c8128dac5a042e057aef3cb5d338daafd284960a9851201f9bec68a06c10a632704b7537d13079f0f539565962a1092dc7eec324b11 WHIRLPOOL 52128075de0d8e841c340dbe408aad6ee10fea41a0b203ffa82ad5a0bf836d7b348e3de6d516012507df64de561741a18d9205a1752b635ec6b049d0c29a3e48
 DIST NVIDIA-FreeBSD-x86_64-331.49.tar.gz 46988453 SHA256 9ac938b54b85b4dd3fc22f10c6feee3d9c777d678dbc08dfa8214e7d917ae67d SHA512 039502ade07cf597ce06ac2ac61119757c980f8f8d8e04f030542f3c34c4fffe9852c880c10bd1730c53425ca6c5f1abbceda4c18bd0060f0de6c593fb6487e0 WHIRLPOOL 0e325de4cb058fbb3f75c55f4d5ad03089ec91db24bdaf52cd63ff477984b51cdcd19e9d1a1cc3a78e759eb0f464b6debd8a086541e3e0641121a9ead9475d30
 DIST NVIDIA-FreeBSD-x86_64-334.21.tar.gz 57725419 SHA256 5f6c34f6cce4190631b9ffa64006b611c92c8e6af8f016f8c541561d50c0f5d0 SHA512 0a2dc4150b0fd2798438cf68205497c12c5019daca1dc1b3d0f29483220c5db4a5837547ce909f2248770fed8061ef32ace710c9cc5866a0d300bee2c9c2681d WHIRLPOOL 54b0f15bc53dee73a3d6d11eee6f780aa1880c3bacfb45ea75187388411669349a2928ef28d2113b74f87fc9ad825b2e5f5413c2a0a110eaa3e6c9e9a6e67ae0
+DIST NVIDIA-FreeBSD-x86_64-337.12.tar.gz 58922101 SHA256 45baa872f7520b80110ea6d5196e8ed22c212473754ece03d1dd6be3033f5d33 SHA512 3e4f1cc1ef7c542498f807133e399d4741bcf151a257eb7c767a3ed316157633f60bbc5b130aa39c14c42acfb823f6b6e37dbd94c5752639e5090fc6eb87a406 WHIRLPOOL 780a7f4e8881bba5e7b9251e6effab7a9194c053fe428f1d053b1ba9ad8006187d2e87171eb2f9d52dc421ca0910e137685f1281827c72259eb0f8f35c83cb83
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.121.run 40081628 SHA256 25ee2e45bd1f728b9de30a88575dadea210549d812944fff2026cf192ea4c52d SHA512 a3848474f7996c260fb3f2692d2c35b17738d6f13fd20fcd49e52bd6b7fcefb91b436ebf0670579aa5cb7d250f5d2eb6ce28b4c087fa5c33373a2da91c42138f WHIRLPOOL 1fd3c0e8f397a9bc58011bbe8d830df9f46370bcb85c9df0e1155ced1d85f9106dd30fae9d708ff94ce92ebe04fa68e6d8ac32ae19840b92e0d3d29553e1ab85
 DIST NVIDIA-Linux-x86-331.49.run 37050735 SHA256 b6725d71f25e22300f1ef92d57089675d454d17746084f1a166576c7105ea701 SHA512 2a15af22a250afc92eedb8abdbf4196da68bd8772580ea8d8573ff94827a535cac2cfab16de94dcb2190b7a893ba48ad14ef7ccc24062ab8402cd79a4b2b76cc WHIRLPOOL f9dc8699063eb6ca3e019ab297d55d8529629d3d70f018309b9f8575c30c81c06ff66d9f39456eeb026b2ad3ac319ad0a197494f1454e3a9edee3d5bbf6d6579
 DIST NVIDIA-Linux-x86-334.21.run 37740148 SHA256 ece6ac1d66b0de53b6db0ae92f72112f734c9ec4b7f1ffb1ec508d32f700df39 SHA512 b52a9f08fb91ef915c3c7ce2aa34ecdd93a5fd8731d7f4b9cb887289f931a4dc5e82afa259bc985be55964a8c788550683ef61306bed9a32a5614dcb2d64373d WHIRLPOOL 547862c1ef1b1f3c0684af38ddef9ecd37776e820a7d5c2a7e2ae2e71a5c7956fb1b5c87b78f60e0ce52b7bb7f37efdc27ee4f62a1d42699f48a69521ee42056
+DIST NVIDIA-Linux-x86-337.12.run 37923578 SHA256 4780c4344e1dd77fbbc369fae818f8eaf4a32e5de152b810f2d6e9371b606eb9 SHA512 2ec35db2d66828093bbdd4458ebe441a6ef00cbc04b8c65f8e3a9be8830b7118d34654dff18f87c14bb941e2b43091a680f8d9f1681aed2b8bb0189531d016be WHIRLPOOL d9f828e8a2f5844f7889d6e95ec5f54a13b03f4676f2da39ff82342c8c08c10936062342baf7d0444881806c533e52481db28316d2914f1e0ecc4065b093557f
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.121.run 68553265 SHA256 6532eef8b6f65dc44ed912b4ffa86494a954ae98f53c3ffd394fa511cdf75928 SHA512 d5d241043dab325aee209bcd8732c557250847f41408e1aded2026c849dddbc7d5cf3c42fc63e3bb6b81c2563359c763f902bbfe344258f0964fdc9edcb98d54 WHIRLPOOL ec7ea87171a22dfb73e0e9db48d0ac721a7be9d12c06073a481868690741afe34ffa861967ba919a13aafc9c83f55627c361e7b261a8fa0acce2d880545d2fb4
 DIST NVIDIA-Linux-x86_64-331.49.run 60102684 SHA256 ee0e0c3e95439e3d55e76aa6477fdb62bc62c04805b3efaa1f028ea64d2422f8 SHA512 757cdf445343dd4ff1f6036ba232c8d7a37a15be377d3d7c52e1e096ff0f887d89166a00c2567d374ed9cb8971749c93e3d79b5493d3ea7154e378890c2a0169 WHIRLPOOL c85aae36e53c5c6f81b5cf38ebb335f2d530c1d96303cb0cdbd08421d3be87a1201ccb0882b6bb9a67606ee8ea4819b5e26af2f592d1fa764c61b2b42c9d571f
 DIST NVIDIA-Linux-x86_64-334.21.run 67906887 SHA256 dd35011967b815e096c267f80b36664e34d779bc33017f396dabbd1a1b86d057 SHA512 254500cbb83420df26c860df13a448aece837096db8374c41cc0a979c0102b848b5a6ad463e2daf4dc34ae5fcedf7921767e7bd7d86a97ceff4c683b7ee1c886 WHIRLPOOL c525946dc40b03ee5b395535ee278e09ecc400b833bd501a14ee0672ddfb61e1f3dfda305e9c1bdf70344dc34b6aeadfa68a636afba0a80e33a1da808c8f17b4
+DIST NVIDIA-Linux-x86_64-337.12.run 68367946 SHA256 8fa588e0491e652a1cfd45aa01be9336c9b5bb5dd54bf45801a40d53d957e4b4 SHA512 56de594b902c81abcaa69e556ec7895f2446178621304dbe2861c055afd8f815a288acf1ba31c6079bfe324d3ad46a64b47a820c844e06911a4e33cf86009a83 WHIRLPOOL b1b6012d10dea80c69ededb1774c5b65d81763f5aacd4304d1f315f41795d3aea19fa00667da1fa25b7225952e94198633764701ad3355cc57bfbf7ec5fd85c6
 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.49-r3.ebuild 13134 SHA256 d0c151585135590289bbf40fc41871990da00192707963ad3f3bb0cd1c862cf3 SHA512 4872ca61cbf32d978f0ff2a2d1a1c6c46d6593f8e0228d54b12b6a4adf1799a5f621b91e0e0d77e602630ad605076b6168a05004ecd3e2ff8eafb858fe06e429 WHIRLPOOL e3955d298ff375b974e988cbe6b458f0dd98ccb2f080a76cb7be48292b001fe66c09ba0eb55351028d3b3f5275ae6798d81004d1faec82e016ef8b9c83558002
+EBUILD nvidia-drivers-331.49-r3.ebuild 13134 SHA256 7275e160ce76fa2df73c96254dd69795c793b336685a21dae4cf3bfd1a41e1e6 SHA512 af18c2fb0374e7fbcaaff47d754f40c60bf8ade1a84e28e282e0486247720788f61ca738c2d2f78dc2034854b4084eeae80db5aa8b2eba2d33ea84fd0e97eac5 WHIRLPOOL 1de40dda10d8f5a46e91995c46ccf8fd47d82b3ffacd1854cea769956be476ac219bd0d2f1747d062078a3ae7375ad04721ff013ca5555328670a1a383532cf2
 EBUILD nvidia-drivers-331.49.ebuild 12883 SHA256 12d574db28067e5508b610553e3f213e2e7e400d507a6d21e4c86d8c8fb53189 SHA512 1fc7a8ace8db4dcb47b30dd9349926151e0f54c17ed3a06a2c91717edb330ecf325232131d3d948f54f363028691f68e5150524f21494632339ce8282a103ef6 WHIRLPOOL 305306e11ec0ff78330a40034e09059978bc735fa38e2869177ff8f2695981fe5cd52d36f1029685b3f4914852505ae70df9e6e71c1e950ad6f1380831448bfe
-EBUILD nvidia-drivers-334.21-r3.ebuild 13458 SHA256 02145f356fd92126b2c3111c6ebd3a596e3267ff1d2fff0d67e1af5cc1f069bc SHA512 8ad40c66c83c200e818fe2bd0e1a911b267e0f11fa8c8ffc177733b4e2673a33a3f1932c345f2399fcb3f1b092af9eb67e0a425e3b00cf2e6fc12cf236117684 WHIRLPOOL 57bf600e6a76041c77dbfd4ebeaf80ff775757ba2d6471a901af3ba5374d1ba4766e04941c2c08b47d02ca8477bb0169c615e1af78bf5d22efc5fc451c2fee16
+EBUILD nvidia-drivers-334.21-r3.ebuild 13410 SHA256 5d9c3282b03ad6be7a39a4301203929cd3a6db83f05653517f8edf21ace3e059 SHA512 2f0b9bf3280e1258d92651208bc7aa0494530abf89ea8d51be49bd6ebd5c10697665c1c82f4cd9797d84f46de2fe1b6ac745409dbb8a18c2e8b3a314faeb88d1 WHIRLPOOL 5014f7319950b59c5b7df0a030e2dfe1b8154ca435a8fbe8d47613e607d78e5d8bff49ba0fd0ce98907868a86c838d75109fa4aca57425642da3afee652ed4a4
 EBUILD nvidia-drivers-334.21.ebuild 13283 SHA256 5e24c1c7ab663f35a6a35b0a135ee86240c6e7b9e457b0fb64d6066e136577d5 SHA512 1b669ad23d40f1a77ded74336e75ee1f309e704eb851c603800047e5fe584de4d9c9f34ad8d2c99db05daa8e38972422d104d620e76fe8d53cd740d75aec23e8 WHIRLPOOL 57650878216739d9a4d8b0b3909b542fde0c44f015e0e07e9efeddecb14a9369b522580b01882ba5189f71edd93c260a652b64f8859f86b1a4c7fa80b7fe673b
+EBUILD nvidia-drivers-337.12.ebuild 13227 SHA256 09b9f1271e5447a1c26ecf89f0b5e26d169b8514231117ecda553e4fd78bdf30 SHA512 76e0d7ab790e49ba77033d4798c176202a950576a13c129f508bc754345e2c3fd310f41f06868ee694eb666f33ef9a2c6269fa211056309ce1989ce9ef7a256c WHIRLPOOL 25336d5bbe41be5078b6a0914e6afe2e8c12fa24939a548184a51b6bb0b0abadcca0925ad892813a1bbb8fdd371d1d75051f82f3c573aef649431e5a9969b12e
 EBUILD nvidia-drivers-96.43.23.ebuild 14881 SHA256 d10341d00b552518b6cc075552b958d9f6bdf9237e28bd4392c17419d52190b8 SHA512 edbb8d34b02db54b071abaa977cd5a1adb2650282aefcf31bc608e743ae0f3c68d4c1c420b729b80bc2321b6f2b720ad666448b0d6b3804467005a2ac06091ed WHIRLPOOL d786cbf75263aa70d4cd66bea752e607ea4b6511ad78e970bb22e15c7f0ee38104ba85398dff7e72e3781d79dad9a2e4bcaacbb5d64da39e8b702cf9b7af827d
-MISC ChangeLog 6565 SHA256 205cb335238641c702db972ac378ecb2b2c7a055ba87956fabc10eaf9a9c9dba SHA512 63a51c8ce7e7bfc58f72b0b68a0edf87bde1b1d269c0f80e798cd52b6c5dbc8209aa2b545d1ed8821e04554a459392f52d2b8daf01379bfe70a2007f5e314f4f WHIRLPOOL 568a4a288d44a53c61f163f4e349eea44a74c38f8d2535d842a8e97d80471215f6c2ff41c4b1ef08739a0915f6c127c021440a0d715d2ce6ef1754b75ff19779
+MISC ChangeLog 6812 SHA256 42d169918dda94504654d3881e9aae8a918fc2168f50da18ff249c8f75d2703b SHA512 7bf92dec662d1a8f160eb96a2091de4382f50906772f3c41a8a5b9fde2279f3af9c3a0afd45ca0e441cf34c6fc7cd1600558d30905b37243644314b299e71648 WHIRLPOOL c507dc87ff6374a5284c67703351e26538dd2d5bbbc6261652da1fcd14edabece3005ef14afb038289a9dab54fa594b08819e393dde4ab2479d67035bdbf5acb
 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)
 
-iQIcBAEBCAAGBQJTRFYqAAoJEPGu1DbS6WIA2m4P/1F1SzitUvF7evY3mRB3sFkU
-C4cSFPWwEFEkDiNFkudyOo0wpqccUO63NNvrit+9QqBgSvPo+LR++hmiKEgWcL5i
-cRMwo/RZ9f3eP4hheZEwoEobdpjSMY/za1O9hx6IdfNiRCQixRsv4zTWOr3LuyJk
-ZpO6PvIg9zdUuuSaCiZf8DYHG8YR3GJOCZKnTlshp9o3iGkHfN1YaPS1HJUu0bRe
-BHJEiLqW8GnY8h7AbmwiHXAIi+JsynhH7icdHc6I1SPZvjv+e4sfhZcZOP6l8Y6H
-JFNW8FgGgOQ+mGgKoWs58ldtz4kQ/0zQIZ/F4IUuS4/RdGtJUH8YH8k8s/R6xi8e
-AFc1k+Ni3KsfsXkK1tcfxpPxo4q5ggRrGrGrpWh+VqOHjHMNfaZMz4kntpiekRu+
-GfowYFSS3XpnEC6YujfNPi2pIZjph+qY6m2EBJgyd2/wTlE4tTzo+bgkOZG3rhTc
-X0LExopiAz6BT5TStluA4aMLhrVOOySJq8xgmvCfZjGbieX3XMdADFrIUsFiHAht
-Zrxj7tPhRisEjXKwRYH/wCHHN5dU6Ul3Ori4NiEGyjsHhesTfnFvwG+drUPIhw6w
-hDHE8vKCzj6i0/qV5pqVeieIXuLVeZqvzR4tOKgqZaSONVLQ2W1kyicCwfupQBWU
-vETwP+5b+QKOq3ArQMFf
-=aNEG
+iEYEAREIAAYFAlNFb8cACgkQVWmRsqeSphOhdgCbBJfRWKzRE5s9mI4NBY10lUof
+BIUAniaFmQci3rvhJahmGGhGQ+PuAjRj
+=y+08
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch
deleted file mode 100644
index 5a1705e14006..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-334.21-linux-3.14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -273,8 +273,12 @@
- #endif
- 
- #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
- #include <acpi/acpi.h>
- #include <acpi/acpi_drivers.h>
-+#else
-+#include <linux/acpi.h>
-+#endif
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.ebuild
index b5d894ef3594..dc40c5a0d122 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-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-331.49-r3.ebuild,v 1.2 2014/04/07 13:27:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r3.ebuild,v 1.3 2014/04/09 16:05:24 jer Exp $
 
 EAPI=5
 
@@ -332,7 +332,7 @@ src_install() {
 		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
 		doexe ${NV_OBJ}/nvidia-modprobe
 		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4711 /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
 		dosym /{opt,usr}/bin/nvidia-modprobe
 
 		doman nvidia-cuda-mps-control.1.gz
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 63d7d96185ee..bfc79499a5cf 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.3 2014/04/08 20:02:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r3.ebuild,v 1.4 2014/04/09 16:05:24 jer Exp $
 
 EAPI=5
 
@@ -177,8 +177,6 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
 	fi
 
-	epatch "${FILESDIR}"/${P}-linux-3.14.patch
-
 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-337.12.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-337.12.ebuild
new file mode 100644
index 000000000000..55d501952014
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-337.12.ebuild
@@ -0,0 +1,477 @@
+# 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.12.ebuild,v 1.1 2014/04/09 16:05:24 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+	app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-admin/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.4:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.15.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 )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 3 15 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.15"
+		ewarn "<sys-kernel/vanilla-sources-3.15"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		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}"/${PN}-331.13-pax-usercopy.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(udev_get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}