Version bump. Fix x11-base/xorg-server version dep.

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

4 files changed, 552 insertions, 5 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 00f9019d3d57..d3f656406436 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.400 2012/10/09 15:12:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.401 2012/10/17 13:12:13 jer Exp $
+
+*nvidia-drivers-173.14.36 (17 Oct 2012)
+
+  17 Oct 2012; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild,
+  +nvidia-drivers-173.14.36.ebuild:
+  Version bump. Fix x11-base/xorg-server version dep.
 
 *nvidia-drivers-96.43.23 (09 Oct 2012)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 02fd48671a6f..969d6818c3f6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 09nvidia 61 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 SHA512 14c47fa164bde3422b64224e3e46e0a6097599de6193b6d36eb162271d41130f0498f6aee09f5cb60fe43727bf74051f9127afa1b4af42efc28d40af2e4fa86f WHIRLPOOL 34bc9975d132da84506a61a119a5d8d8b5be35af5c1511b5e3228fa3d9f0f3b7f84821c0ab09252054d1471ac7901522309d440c82342d6dfdd2beb73f680460
 AUX 50nvidia-prelink-blacklist 319 SHA256 61adce61498451898c22fb538151379438729957418eacf4f69195b3e03ec1f4 SHA512 7252b464c45669bb402859ddb2c95f4553a37027870b6aeada3e1dd58fefe7b4713d3486d301177efdcd7559dbc31ceb6078220d5c0187bdc636d817a98e1a41 WHIRLPOOL 93e14ed7c8fb5dba87295c87e1e8906afac290f63dc6ea023fa6c387ed47ff13d488b3b24c400aee42a22737856a7782925d9a3a412ddcd1984dbbd7e51579a5
 AUX 95-nvidia-settings 54 SHA256 c4b293c6c2659bebcbad9cffc1e237c6908a3763599e432aba89d07bc2826ba0 SHA512 0fdaff8701598081eeb78defcd140b78f75309ace998df67569a15d0ff653aca7ad0576912bf9a619f42990e6fb35cdb79e21f8181d3cd04dea719d912da8be9 WHIRLPOOL d71fef01f8c346089ef2556ffe62c5094f89582b73500711a7f18f25424e59baa12f6b0861bd8efd9bf4c5bbf794642927ca322cee218fd2da9fc7baa50fa827
@@ -15,6 +18,7 @@ AUX nvidia-smi.init 671 SHA256 5776a661b510e072d34e779c23dfc710a13d04c49acc22772
 AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e WHIRLPOOL cb9995029cdb2fe1bc7fe5ae54041ee5de8da86bf5eb3616d062475e56c44d436e1e66683ecddd986fc5bca5723d88da4b1a42f65f3cd7e15636928bd21fce14
 AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13
 DIST NVIDIA-FreeBSD-x86-173.14.35.tar.gz 18748428 SHA256 51e82a12db81b5af4ae5ee59612875c0dbef52cb641d61a44c72f2e1cd7f4c78 SHA512 11c26504641895cbfe0af18c4578d5aeb9bef48270dde1d1463250c0b26e9b6cab0ed97402bc07829b489ee5b773e6bb854fdfc87599c726d48dd0c59bb49336 WHIRLPOOL d739fbf2452a3b4f418d6b901bb3fd2940c5e9758d239760a9eae52ac6079032cf10628ee121ad44138c7eac4355f627dc41b1b765d825d58c18352359740520
+DIST NVIDIA-FreeBSD-x86-173.14.36.tar.gz 19167108 SHA256 85e45920e8bbb85b76da802800b909871c042cbab08d1417f6618032cbb062cb SHA512 25917609ae8f2c4623f21787ab751b090b693bc5335be30fac2eb3056a59cdc9b923ca19cfe85ec0c12c7501e15711c8f71d5e8dffd84a901ed8ea68bb781e65 WHIRLPOOL 566f90b08eab524e780c73ef3443c60d119202c02f6d78385be21df0d261293299cd31da39fe2554cac59cdbee207f2cba21446ad0cc4a04ec455f30a403dcba
 DIST NVIDIA-FreeBSD-x86-295.71.tar.gz 32098813 SHA256 6cc7f25c3b49d3ac2d2cdc2d84e4f0417d51115110bee159de2cc53d7f9ef049 SHA512 2a5e264595daef0b1bd78e523c3a5eb9d8be37f6d18ad515cfdc36eb3712e94f5cee6ebf409aae653657023cad11bee7a986d13618b0eb101ac7bfdbb7ff3a45 WHIRLPOOL 34481121243fc0894142a335398a08805d64208b71cec66f587ba25cf42e8aedfe8978ac77d061f8dafea6ae0bbd3cd91f5a45e2377408ba6fbc752df18c7127
 DIST NVIDIA-FreeBSD-x86-295.75.tar.gz 32100768 SHA256 69702d5f27343672646bc93ece44367b2204e77b5b7e9c3234ac415629e4d8f3 SHA512 78b4aeebdc218b6d15d97f89f5eaeb3dba0d9db01f5eb59e798fb5b129577ca9e7321e497592c367c7c56b7e1a25d5265a2c97727b79b259730107b745eb3c17 WHIRLPOOL f94f330ec35c8e08b812f127cedecaf3e1cc939ec19a9905b19788fb0e102aa9900ab8dca6dd2bf67f5c34dd730ab499b892a99502b9e669b8cd317991f7e4f8
 DIST NVIDIA-FreeBSD-x86-302.17.tar.gz 32072917 SHA256 b0d50c3333ee7c485bfd5287b37e253ed358dd5d205997f0c50e16f04b7714c5 SHA512 e7adefad95fb8345728d9920324946f87b4fb94b8dedf7ab1ad49f7c02015ba6492aa95d07e5c2914b8256f62b743b7eaa2267fc8881a8a335e3d60502d1786f WHIRLPOOL d541381f6492e7c1c4f0d77109b5371cf17009c1aa0157dde5d911c9100d4e7b30543fcdf352822bf53006da16b3e0bfb49621b4721be49ef6f81b7a6874ac60
@@ -32,6 +36,7 @@ DIST NVIDIA-FreeBSD-x86_64-304.43.tar.gz 34225997 SHA256 5e76b1660639b2af2fcfbe3
 DIST NVIDIA-FreeBSD-x86_64-304.48.tar.gz 34232252 SHA256 89814a464e906632e28e3e78e80cf7ef891e1bf23989c96f37dfb3c636265eec SHA512 55cd4fce3226fe99dd8eb1543c60ecefa709234547c616c5d932b75990b59f9af8f2b4946f193170ede0a727100eabc6bcd5a497e758df3fa4fd0baac188ee05 WHIRLPOOL b5b2ea29e53d6a57784ff892cf15136c85dc77060530f400e74030d069f7f95ed285e6afe612674e0e253d6cbd3740d8b42264c5c14c7ba92addf6af7ca744e1
 DIST NVIDIA-FreeBSD-x86_64-304.51.tar.gz 34233798 SHA256 0db3ca0267b20e4ef60f480375860fdf46848e58492ce452452264544263bd56 SHA512 d84f592a4cf97638346fbf14062d678dc94311845c17b43f8ea451cbf937d71b5d6eb380f462fe3e50c57558fdc11cf56b4e10cec43235a34113089986c5f1b6 WHIRLPOOL 76c000899ae171a67abcaf2f4b154fc7c1b785e1714071ae7ffb3570b12a1853f41ac9af6d5f87ba8448531445cc089bf4ce83fd351f484ee6ba4e4d05b0eb77
 DIST NVIDIA-Linux-x86-173.14.35-pkg0.run 14028887 SHA256 2d26100f7691047e424e1614deca0f1d862da5fa69e04e967f0c1dbb84ec729a SHA512 6f752a33ec69ec05979e2cc8754c59377d248675ab3ec2a55212a97ee6591e80942a44b96df612ed1b41eecd2c7a0e49f464dbe251a74345ca6e9b8650dc095c WHIRLPOOL b58e84c02e0e151555ba48dbe512d4f85de4852af6ed98e4e10d6cff1ce52f5a5f509752bdc28a31704a9a7d3325790ed236c37aa31622d096d39507653121c1
+DIST NVIDIA-Linux-x86-173.14.36-pkg0.run 14400303 SHA256 ac246f1250756863be3a6a8a8f3ba92d4f0fcfb5dcab3a836b2af3a4eb8c96a7 SHA512 986ba6dca934100879d1e7a38a8085996ea0074666fe9cb135c4dff43602df34af175b54759576700051c33ef72f32d86f544df892c59f62eff0312a233167ef WHIRLPOOL 8e424423a8010b3b4476cbbbdb14132330a2f54b68cbe3843fa6367e86f23457c9640eb35d4b17ff437726d8176f21557848c4ef4c7632dfb1753eb2c9cd886b
 DIST NVIDIA-Linux-x86-295.71.run 34738880 SHA256 e02dc300324eb953278664acfe5f4c3e6e4b7e45cc7b1c700c79ff368f2c9e4d SHA512 430b884d8e510dd2a722d4893f85a4f8e4227e3cfcbdd802ef1edfd776d4f6ca487854e1fc509537285fdc38c2d87474e3e7c9ed728871527a06227fd4306e3c WHIRLPOOL c65573d09be775e29c889c86bf8fcce2442d5e9e3d6aaedd6e2147d7fd12cf3e9fedc736f5cd90116ea1dabc169f7a42aa70e34d0c93ab6d1862cba13acfd6c0
 DIST NVIDIA-Linux-x86-295.75.run 34751902 SHA256 61158fcfe5e4685e69f86de1f411a6dd1ab0e33082f377ccd2bc7469fde143f9 SHA512 03101b73bdbfa445799563a1807fb04bf60ab4366a805ff6168ac4738d36061c99c208af6ab2ae5d5a3426cbf29c0a47aa7a6112328fd29b54f24709e75c059f WHIRLPOOL 390c441d140ded3ece7130040c2bb77ae22acc0c2e1532cbf98d369a2746bfb5691c77e275dafeffe91e069b74f67cb8b63f8f8a4f288699b5b6d970bf1574d4
 DIST NVIDIA-Linux-x86-302.17.run 34598956 SHA256 3525d3814361bd202998cea2962bb3d1bb3419206d02fd8ac30d61358c1a284f SHA512 e2ec7f9dcf566c9ed0085eaf45e40940830677f3d964077fb34681b6518a3a666fae6c7594e7eaea125c265db8ecf2087a3c309c0dc63ab9941d051ee73b252b WHIRLPOOL c81e3e8da372d3a217d0cf08f05d9aba468d75949d7a3c025595327aef7c61b882eb2bbef19373ebf2a79b5210f873cb7b13597fc6e9d3612791bec3ee1ca58a
@@ -42,6 +47,7 @@ DIST NVIDIA-Linux-x86-304.51.run 39375416 SHA256 78fdf66377d996863fa56c9165745e4
 DIST NVIDIA-Linux-x86-96.43.20-pkg0.run 10323541 SHA256 bc778062cf745ee4916de77a702f702312d33eeb3b6f379b63e4366fa5197517 SHA512 6fd8218dde3f3a3b49e83cd2e9df6aff502d17483ac5687c4f7009671a456bda008c12cde7d73a9d9999e6da777fe58f6093791cd7e7b10113c4a91deb1340fb WHIRLPOOL fd8e54f171bbf004eea9e7ea9bf0ad49386173e357221679f7144f6c9ec11d37d717f9b764a24a37bc10864b37e937a5dd7fd68319aa3e10edcdb835c4a2b1b0
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.35-pkg2.run 19767039 SHA256 5af64646b098021b550242fe8eb03817f862af0442023545d1295027f589595f SHA512 c6f4b56f9154af06bfef888be94dd7bbfe48e67593e901da13bc60bb0bfbfc7d00995ca61820419259e80fbc898373d26ef04c309ed6af3b73d13dc1245cc5e7 WHIRLPOOL 3c321157821751dcc82781db6fd0b9df6697d688280763ebfb11d8c004df1d5d7f975b70db9271797bfbe30d525dbe9b9a9987aeb272d854cba5a974c04d7584
+DIST NVIDIA-Linux-x86_64-173.14.36-pkg2.run 20207393 SHA256 e7e3a23e80eb300d32b0203d360a5158162f5ce0f86be0ea6875e9a2b3ba4381 SHA512 c652f7333c809ebb3b74ce1e080cd506dcdb60ccacb0b7aa79d04a4f993964040edc6ff26673b2028a844052d1b313650aa1b4d0cffa35785ac0a9ada48319a5 WHIRLPOOL 22c0b1ea44ce3ce1636c276c1d0e0e5bc25c99556c207b16dfc42429008d968e5949c97c1ade3f8a17d991bb3b9ed302e2405dd216310e878e49c644891b8867
 DIST NVIDIA-Linux-x86_64-295.71.run 58537709 SHA256 956c7660bff61c07a99cea2130e73baf1574907008d41d9462147aad6b83dcc6 SHA512 7eb21240ca44a648c081e38aab3ae6203ca70f2dd4ab187c67ef1f3cff9ab848f4040a640dfbd1f146135b37b98c6976943ff6caef8806a25784ff2263d23e8d WHIRLPOOL ea85d8fe42b15f7a7933b8dd3e31a48549a7dd411f21f60b69986fda8b2b4b53c6148194227097be6bc5323b448a5a8c452c784591e32281be576403e3caa435
 DIST NVIDIA-Linux-x86_64-295.75.run 58548201 SHA256 b7ae04da001ade59b87abd15e7786b3f0fc75a312368fa466f6c0400e803debd SHA512 2e8b932d1e9ab9d4585fee5e7ee28f4aa1ba61628e8d8292599839ef8f7651c82dea77c438a516452aaaa565bce32455764f21911f6c88ed294ff6d7920004a0 WHIRLPOOL bda10ba441d273bc5863ea038f0a6da34fade860f7b00ef3c1dcf7914e4575fac97d324304f0f78892597dd812a9f6244fc09d0b16beb90314fb3099cb9c501f
 DIST NVIDIA-Linux-x86_64-302.17.run 58653717 SHA256 5cf9059ebb70ade99e5621c0a605ed5bbb6c274f7c52a7ef40342ceb41b381fc SHA512 2e945eab66328e0fd71bb5c428ada87fc210748e71605f1304d0b37abe92ee247834a22ce0a58e14bb799ee99e704dcf5daa17c036a6648445c30a90d30a25b3 WHIRLPOOL 49c141ad09ae74a8caef2e25d0b6b750a02f6b121b8951ef53ca43e6863f7bba243b380f9c8180b5d0f5fda6b009a32252e3972cd61c7f7626a5841e65541c82
@@ -52,6 +58,7 @@ DIST NVIDIA-Linux-x86_64-304.51.run 64118811 SHA256 28654ff26923660de72964880541
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18 SHA512 ca89961463bc705b1aa0e5fcbb284317e60e455d444035ba8f6a44cb3884f3a4b4c98ed5a37465d6f70a0eb6578a7d865b25f15a6b6f48bdbcb5aaca6e541623 WHIRLPOOL 873e32237ee1441625c1335e1d325649f139306a49bc87fc25afe81ec37671984a2f0bb904b2d7b435d5ceb52572740bb910fac32853627ce5583655178674dc
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.35.ebuild 16668 SHA256 50d53cbce419e474e7e6611d8d8a96988d4863f0934cca843e50d3ba857b0840 SHA512 ac31942bf15278e4ae90376a55e06925c639592325b34cac7d3df386ef863bbaa8d9b554cfc6431ab72777440c08387af5ffd8bf03a711dd34596e9553c5f073 WHIRLPOOL 145bbd21f812553547065bcaf5f2e264de5b05b72bbd068fc0498f0ecc9188993d293c086680b9a4e19479b62d88cab727e12f02666d13319bcbe85b5f7a5b68
+EBUILD nvidia-drivers-173.14.36.ebuild 16667 SHA256 78b1f0134dd3cfc30b5bb590b4c90ea1561aca75d7f01a2440edd06f27cb931b SHA512 50b2e9ea6e34ce09fb48768cf0d9a2badead1a55921cb06a16ac0a5dc992dc1af4d93565f06e0b5d1a543eb0c8012cc438ebd77acfaac77ccf7ea5648560fd0c WHIRLPOOL 674de27ac46062b07f7f918f31c7fa82df7554a07ef0e54c705eca297dd28587556a1c4a9b13ad5e713cc647eaccf9a17f57722e031d20b1375d582a97ad93d6
 EBUILD nvidia-drivers-295.71.ebuild 18409 SHA256 57c7941eeaf10cca5805ce2d15ee2c8ea12007a1dedf08ad4e9d3b61fabd9872 SHA512 e7dd6c2138f73c2e12412cc1e36e3c1986c609165f03b40153f5cfd9ca9b85b339facf6f043683cb6f9aa5e65811d67d37a76bfcb0cfbed96e1c2e7e42a91886 WHIRLPOOL 2186a695dfb64621e00d60da84fba7695a26c6e256c95a03ec976b962ce311ec4e059f40ed731e87485c71c9913e10d27a30122de8101141ccd08f30fa6fa1b4
 EBUILD nvidia-drivers-295.75.ebuild 18399 SHA256 8613d0372bcc8af97e5901fd9b61bd5ced42564ffef0728bf685dd59d185b077 SHA512 82e8d7b8abc1a9f173d3c858963e4910519a3f718de13e1fb69624863c9bd5270a1fd12a479f79ac0f611113ad81239ef06a3e4e87f2dfd6e8e2da32bb5092e8 WHIRLPOOL b777639f5e065e5254251cd60b1723b103f30d02e735a7c1db98a7b22e31f98a959d9c6e685b0edbabff769d17d01d7eb9263550f4071f444da0c68e3f2eccd5
 EBUILD nvidia-drivers-302.17-r1.ebuild 18698 SHA256 35904addec73863f63bb8fc43c5af5e2fb64d045af5dfd398c5eadbd9895a023 SHA512 841cab5ffa46133e92747bc6ed1c6da47f4c7bbc17acfc2eb69f6cf5fc8ac117c65156952e88d1c54448d81f139232736a74dfcdb4bab1c33aecb87f088867f1 WHIRLPOOL 6344ce83089745633704607ddb52f0f9a3ed8006b5c3c28a2ffa98d5856a093c6a9657832e49205da2ab5d39511ae863ed2fe1ff3cc3303debe0e38d2c27aca9
@@ -60,6 +67,13 @@ EBUILD nvidia-drivers-304.43.ebuild 12757 SHA256 dd68253051edbd209519bba87930a78
 EBUILD nvidia-drivers-304.48.ebuild 12810 SHA256 ab5a76e604b7cef8bfe5e477633a7c1afc2075664a3d747ecff2d6086632b759 SHA512 9dda2d0a34e37256e553dc5e384e806f8e51fff3541bc4201bd01065adc63d6888c2e5220499b0204ca0985a6a96f6e7f2351f09b21757e891918979dd1bfa5c WHIRLPOOL fd35c96adcdeb5b284d8986792e1b73c3fb5426ed964e418c20d123a8c8e7303b7cab26d25ef11be7d7f7fafc6ad64754975954f0f9dd1a2d94f8b2a459ab2c3
 EBUILD nvidia-drivers-304.51.ebuild 12808 SHA256 26cd467b0002c42f0ed5be5ae52ecee2a3324e082fbaab997509debb1a818f76 SHA512 e7a6a31a61430bd39d236b8898e93e03569db891be61a4755af659ed2e9dbc58f4bfe6fd62e96a472df1672ee15187d1ff13ed50940d9334912af0349f67043d WHIRLPOOL a2666bee4110771cf78fb037e996cf3d12974571c89e6a02150c6b8d722af0653114636e5d5df4614870818592c34af61286e8227f4a625863fb77fdd371d6ae
 EBUILD nvidia-drivers-96.43.20.ebuild 15283 SHA256 dc5391522b493ae6fd04526f41ef1d78cc43d4bc063f06a2f9f04fa6f996bf16 SHA512 f5c198dcadc904d8e96f0071dbf1449a418b147b132b697b110fa9b313cb6678e8c3a3b496c8654655b9f3eb03360742a11b5b689062c4b653baa750d670e21f WHIRLPOOL 0224ba1195f9a231036b8f74bc291776d4eda966f82b7eb7a5f81744d989494d26b8e86ac83e866104bf847f3fded537dd386c9b11f897af3d92ee37881eaa0b
-EBUILD nvidia-drivers-96.43.23.ebuild 15281 SHA256 e14a8164909045d73d51db8cb1cd790008b5fb95135d3996cf3eef2a828e8009 SHA512 ae02d0b7266c32b5e1ec7e5a757587e179ea35820586907ef616ba677f9a0ea69101a024cef3cd9e10919eaec5eaa9aeb3fece2267e0de757e61457e58d5ee41 WHIRLPOOL 3a4ec681218eb85ffe9d89a4b71969f54179280cd63791155aa18ee335982b98f445a81beb4177e003880f850f54495e504dc628192e789d4ca834dff8ed1e5b
-MISC ChangeLog 84851 SHA256 833a159fe2a19bf94c7f552b457d4fd99a842e88c0a35d325c0a84c98f0de607 SHA512 59ef43742b5ccce064c70b0a7a34e67ed32e7ee62890f8c2971458281905041f0dd21bb6459596b0806342f8588462a569d59dca9386eea91b2cc8a4146331ff WHIRLPOOL ee9d91b4262f7e0275cda11b1d02e510e8a539d0c68ded3e567968e747ab12d24ece37e6d4b23b6d025aa8577c3896320efd4c960ee12035e281b3079cd42212
+EBUILD nvidia-drivers-96.43.23.ebuild 15284 SHA256 ee9a9a3bf7e7d26636b76abb81a0c58bf97fdfcfd78246c5f8e09bcc4725843f SHA512 dd9fd36f8f134888f3084eb0c0060e97f3ba54934c57337f8ab20ae2ef6c1983d709c4ce2013fe108507a7a1dde1617d67be117076735f37cc3273e1a595b3df WHIRLPOOL c5bbfe70ce9e5b06a6993feadff02cde72cdaee2cb1823a1025ff68fa38c98367b770915c0df9438f52f5986cab038497457d52258e5a6a014239fa0bee57cba
+MISC ChangeLog 85062 SHA256 dff0d83fcb1d1586bf1f6254a44c2fd14bcfc1b0fe7ab9dbcb1db09345415445 SHA512 49b1cf1a90cd218d6347c8e726c2bdc572a2174e39a036554a7c2f180a3f609d32769141efbe0c073b8ce1226b5b043854a6d03824a0d90358bf42fe2e33e441 WHIRLPOOL 86ce5dfb91632e31ba036290d5f1b7d99d4f43944a5c2344628eae5e2be9b3bfd7147a0dcc4b4d9e979f9315c781a937718bd3cf7d904fc9fd04331b4c527b37
 MISC metadata.xml 937 SHA256 807dcc6ae2775af89d15e2253a264ea0d24803bd876f93519d9dfa46abcd8c80 SHA512 85a7324e9a065c9bd003e1f9067adf5ad5408cabd5e37480422066fef392da841622aa6049aba0fabe249cc7e5014d4cb8435e4ad8507645802fad48f2021af9 WHIRLPOOL e87f8890be0329cffefc58b491cde96920344b0cfec5b04589dfd49f3805250c6ff7ecff2e8709fc930b7b77a32ff65ca530596ea521aaf9e97b6f82ccbc6e01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlB+rrAACgkQVWmRsqeSphOV/ACdGUOZoVuEtep1T1eaXsnRliWi
+cRIAnj1uiGWSVXDa6W7jnoAn9qn33GFi
+=7rSZ
+-----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
new file mode 100644
index 000000000000..f6951f4d2da9
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.36.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2012 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.1 2012/10/17 13:12:13 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
+	unpacker user versionator
+
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+IUSE="acpi multilib kernel_linux tools"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="<x11-base/xorg-server-1.13.99
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	multilib? ( app-emulation/emul-linux-x86-opengl )
+	>=app-admin/eselect-opengl-1.0.9"
+DEPEND="${COMMON}
+	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
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)"
+
+QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libcuda.so.${PV}
+	usr/lib/libnvidia-cfg.so.${PV}
+	usr/lib/libvdpau_nvidia.so.${PV}
+	usr/lib/libXvMCNVIDIA.so.${PV}"
+
+QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+	usr/lib/opengl/nvidia/lib/libGL.so.1
+	usr/lib/opengl/nvidia/lib/libGLcore.so.1
+	usr/lib/libnvidia-cfg.so.1
+	usr/lib/opengl/nvidia/extensions/libglx.so.1
+	usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
+QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/libcuda.so.${PV}
+	usr/lib32/libvdpau_nvidia.so.${PV}"
+
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
+
+QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/libnvcompiler.so.${PV}
+	usr/lib64/libXvMCNVIDIA.so.${PV}
+	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
+	usr/lib64/libnvidia-cfg.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	opt/bin/nvidia-settings
+	opt/bin/nvidia-smi
+	opt/bin/nvidia-xconfig"
+
+QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/libXvMCNVIDIA.a"
+
+QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
+
+QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
+
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib32/libvdpau_nvidia.so.${PV}
+	usr/lib64/libXvMCNVIDIA.so.${PV}
+	usr/lib64/libcuda.so.${PV}
+	usr/lib64/libnvidia-cfg.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	usr/lib64/libvdpau_nvidia.so.${PV}
+	opt/bin/nvidia-settings
+	opt/bin/nvidia-smi
+	opt/bin/nvidia-xconfig"
+
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
+	usr/lib/libnvidia-cfg.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+	usr/lib/libXvMCNVIDIA.so.${PV}
+	usr/lib/libvdpau_nvidia.so.${PV}
+	opt/bin/nvidia-settings
+	opt/bin/nvidia-smi
+	opt/bin/nvidia-xconfig"
+
+S="${WORKDIR}/"
+
+mtrr_check() {
+	ebegin "Checking for MTRR support"
+	linux_chkconfig_present MTRR
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		eerror "Please enable MTRR support in your kernel config, found at:"
+		eerror
+		eerror "  Processor type and features"
+		eerror "    [*] MTRR (Memory Type Range Register) support"
+		eerror
+		eerror "and recompile your kernel ..."
+		die "MTRR support not detected!"
+	fi
+}
+
+lockdep_check() {
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
+		eerror "which will prevent ${P} from compiling."
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		die "LOCKDEP enabled"
+	fi
+}
+
+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 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; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
+		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/')"
+		mtrr_check
+		lockdep_check
+	fi
+
+	# On BSD userland it wants real make command
+	use userland_BSD && MAKE="$(get_bmake)"
+
+	export _POSIX2_VERSION="199209"
+
+	# 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
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_EXEC="${S}/obj"
+		NV_LIB="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_X11_DRV="${NV_X11}"
+		NV_X11_EXT="${NV_X11}"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}/usr/share/doc"
+		NV_EXEC="${S}/usr/bin"
+		NV_LIB="${S}/usr/lib"
+		NV_SRC="${S}/usr/src/nv"
+		NV_MAN="${S}/usr/share/man/man1"
+		NV_X11="${S}/usr/X11R6/lib"
+		NV_X11_DRV="${NV_X11}/modules/drivers"
+		NV_X11_EXT="${NV_X11}/modules/extensions"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if use kernel_linux && kernel_is lt 2 6 7; then
+		echo
+		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		ewarn "This is not officially supported for ${P}. It is likely you"
+		ewarn "will not be able to compile or use the kernel module."
+		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+		echo
+		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+	fi
+
+	if ! use x86-fbsd; then
+		mkdir "${S}"
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+	use x86-fbsd && cd doc
+
+	# Use the correct defines to make gtkglext build work
+	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
+
+	if use kernel_linux; then
+		# Quiet down warnings the user does not need to see
+		sed -i \
+			-e 's:-Wpointer-arith::g' \
+			-e 's:-Wsign-compare::g' \
+			"${NV_SRC}"/Makefile.kbuild
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	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 x86-fbsd; 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
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		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."
+		fi
+
+		# Add the aliases
+		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
+		sed -e 's:PACKAGE:'${PF}':g' \
+			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		newins "${WORKDIR}"/nvidia nvidia.conf || die
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
+
+		exeinto /boot/modules
+		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
+		die "failed to install libnvidia-cfg"
+	dosym libnvidia-cfg.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libnvidia-cfg.so.1 || \
+		die "failed to create libnvidia-cfg.so.1 symlink"
+	dosym libnvidia-cfg.so.1 \
+		/usr/$(get_libdir)/libnvidia-cfg.so || \
+		die "failed to create libnvidia-cfg.so symlink"
+
+	# Xorg DDX driver
+	insinto /usr/$(get_libdir)/xorg/modules/drivers
+	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+
+	# Xorg GLX driver
+	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
+	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
+		die "failed to install libglx.so"
+	dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
+		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
+		die "failed to create libglx.so symlink"
+
+	# XvMC driver
+	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+		die "failed to install libXvMCNVIDIA.so"
+	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
+		die "failed to install libXvMCNVIDIA.so"
+	dosym libXvMCNVIDIA.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
+		die "failed to create libXvMCNVIDIA.so.1 symlink"
+	dosym libXvMCNVIDIA.so.1 \
+		/usr/$(get_libdir)/libXvMCNVIDIA.so || \
+		die "failed to create libXvMCNVIDIA.so symlink"
+	dosym libXvMCNVIDIA.so.${NV_SOVER} \
+		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+		die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
+
+	# CUDA headers (driver to come)
+	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
+		dodir /usr/include/cuda
+		insinto /usr/include/cuda
+		doins usr/include/cuda/*.h || die "failed to install cuda headers"
+	fi
+
+	# OpenCL headers (driver to come)
+	if [[ -d ${S}/usr/include/CL ]]; then
+		dodir /usr/include/CL
+		insinto /usr/include/CL
+		doins usr/include/CL/*.h || die "failed to install OpenCL headers"
+	fi
+
+	# Documentation
+	dodoc ${NV_DOC}/XF86Config.sample
+	dohtml ${NV_DOC}/html/*
+	if use x86-fbsd; then
+		dodoc "${NV_DOC}/README"
+		doman "${NV_MAN}/nvidia-xconfig.1"
+		doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		doman "${NV_MAN}/nvidia-settings.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+	doexe ${NV_EXEC}/nvidia-xconfig || die
+	doexe ${NV_EXEC}/nvidia-bug-report.sh || die
+	if use tools; then
+		doexe usr/bin/nvidia-settings || die
+	fi
+	if use kernel_linux; then
+		doexe ${NV_EXEC}/nvidia-smi || die
+	fi
+
+	# Desktop entry for nvidia-settings
+	if use tools && use kernel_linux; then
+		sed -e 's:__UTILS_PATH__:/opt/bin:' \
+			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+			-i "${S}"/usr/share/applications//nvidia-settings.desktop
+		newmenu "${S}"/usr/share/applications/nvidia-settings.desktop \
+			nvidia-settings-opt.desktop
+	fi
+
+	if has_multilib_profile ; 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"
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second parameter is the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+	dodir $1
+	exeinto $1
+
+	libname=$(basename $2)
+
+	doexe $2.$3 || die "failed to install $2"
+	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
+	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local libdir= sover=
+
+	if use kernel_linux; then
+		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+			libdir=usr/lib32
+		else
+			libdir=usr/lib
+		fi
+		sover=${PV}
+	else
+		libdir=obj
+		# on FreeBSD it has just .1 suffix
+		sover=1
+	fi
+
+	# The GLX libraries
+	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
+	donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
+	if use x86-fbsd; then
+		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
+	else
+		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
+	fi
+
+	#cuda
+	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
+		dolib.so ${libdir}/libcuda.so.${sover}
+		[[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
+		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
+	fi
+
+	#vdpau
+	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
+		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
+		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
+	fi
+
+	# OpenCL
+	# NOTE: This isn't currently available in the publicly released drivers.
+	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
+
+		dolib.so ${libdir}/libnvcompiler.so.${sover}
+		[[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
+		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
+
+		dolib.so ${libdir}/libOpenCL.so.1.0.0
+		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
+		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
+	fi
+}
+
+pkg_preinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# 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
+	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+
+	elog "You must be in the video group to use the NVIDIA device"
+	elog "For more info, read the docs at"
+	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
+	elog
+	elog "This ebuild installs a kernel module and X driver. Both must"
+	elog "match explicitly in their version. This means, if you restart"
+	elog "X, you must modprobe -r nvidia before starting it back up"
+	elog
+	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
+	elog
+	elog "NVIDIA has requested that any bug reports submitted have the"
+	elog "output of /usr/bin/nvidia-bug-report.sh included."
+	elog
+	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"
+	fi
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
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 b9f2c15e66e1..4780278c1bc8 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-2012 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.1 2012/10/09 15:12:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.2 2012/10/17 13:12:13 jer Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.13
+COMMON="<x11-base/xorg-server-1.13.99
 	gtk? (
 		!media-video/nvidia-settings
 		dev-libs/atk