Version bump. Supports xorg-server 1.13 now.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

3 files changed, 453 insertions, 2 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index a8f5e814005f..1ffdda67d08a 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.389 2012/08/22 04:50:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.390 2012/08/28 23:05:39 cardoe Exp $
+
+*nvidia-drivers-304.43 (28 Aug 2012)
+
+  28 Aug 2012; Doug Goldstein <cardoe@gentoo.org>
+  +nvidia-drivers-304.43.ebuild:
+  Version bump. Supports xorg-server 1.13 now.
 
   22 Aug 2012; Doug Goldstein <cardoe@gentoo.org>
   nvidia-drivers-304.37-r1.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 4665640e52e5..cb1b4d96b1db 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -21,22 +21,26 @@ DIST NVIDIA-FreeBSD-x86-295.59.tar.gz 32092806 SHA256 9a3e1794418add03ad97aad936
 DIST NVIDIA-FreeBSD-x86-295.71.tar.gz 32098813 SHA256 6cc7f25c3b49d3ac2d2cdc2d84e4f0417d51115110bee159de2cc53d7f9ef049 SHA512 2a5e264595daef0b1bd78e523c3a5eb9d8be37f6d18ad515cfdc36eb3712e94f5cee6ebf409aae653657023cad11bee7a986d13618b0eb101ac7bfdbb7ff3a45 WHIRLPOOL 34481121243fc0894142a335398a08805d64208b71cec66f587ba25cf42e8aedfe8978ac77d061f8dafea6ae0bbd3cd91f5a45e2377408ba6fbc752df18c7127
 DIST NVIDIA-FreeBSD-x86-302.17.tar.gz 32072917 SHA256 b0d50c3333ee7c485bfd5287b37e253ed358dd5d205997f0c50e16f04b7714c5 SHA512 e7adefad95fb8345728d9920324946f87b4fb94b8dedf7ab1ad49f7c02015ba6492aa95d07e5c2914b8256f62b743b7eaa2267fc8881a8a335e3d60502d1786f WHIRLPOOL d541381f6492e7c1c4f0d77109b5371cf17009c1aa0157dde5d911c9100d4e7b30543fcdf352822bf53006da16b3e0bfb49621b4721be49ef6f81b7a6874ac60
 DIST NVIDIA-FreeBSD-x86-304.37.tar.gz 33291575 SHA256 e6c3a1d4a757b5d4f2ab54a43d5d7008fcb1b481f14515f58adcd31f3edc6576 SHA512 4370cc805b428f331402f5adde386813e40272ab30744f38442b706b1f80c45e2b44ab56477fe7f3ddeb437b5a97cc088ba2f9a67834a45cf42377d450d3f8bf WHIRLPOOL e41ac7c8cbd207483503da81b64ea16f8d80a8c20b45508ce6a817fd5986628c95e7f64bafc8967d96bf0c0611b66da6899153e4e22cb7b0bb9840c07e76c27c
+DIST NVIDIA-FreeBSD-x86-304.43.tar.gz 33305109 SHA256 6a8c229ebab96afb94ea82c2f7d20fd095de75bedbcf7bb367ab7b2c9c3d3050 SHA512 394655c3eccaa5c47d4675dcd6fcfede1660e75f06677e031be38a0e2bd4abdda072b3801e2551e4f0d8dfa0d83cd60729be6037d648ec67fd3956ae0123fdcd WHIRLPOOL 930f2c5c8627b2c3ee94082b4e86820b9de40c0e5e3a9bc1594246af21b510016ed2efd5b73efe61714c930605028b70b9086b3fd0ab672f5221dae9fddb0c87
 DIST NVIDIA-FreeBSD-x86-96.43.20.tar.gz 14060884 SHA256 e75fce272e72644d53e6ad3c0957fe173735a4b621726ce227ba8ecf9bd9c5cf SHA512 3a2c6bdfb6e4d8d085abe53a9f64f45a9872d968698da01599f27ae35d197d2e32e7cdff4873f6fa646118af48bbee0ecf95e6af3a9af279fe8f39e72c483a97 WHIRLPOOL d7fc9fd10b09b028e27203b388594a9d61d62f50bca7f2b667c53e1fcfea299029024e16f12f3114d0bbd4fd942bf51daf1f3467588d7e96767229524c980e5c
 DIST NVIDIA-FreeBSD-x86_64-295.59.tar.gz 33049711 SHA256 4993f2c4874c080352856b1eac529c7be61aff73ea9db7012a04a571f3553bfd SHA512 be7ddf23181386979b085825d0b22c0270a1acd3b17aba1468f16370db5ad7886d96d66eede213427f442c7e857e44e5a734aa5f20753d4ed9f4b2dc649dcad2 WHIRLPOOL c833c5a587645765b781cd869bccdab92fabd9ae133574c3698ec5b29d4b91ae93635de6fba962586af426e6b797b2a8f6c897af7958a0a596155c5cfd9ea6e0
 DIST NVIDIA-FreeBSD-x86_64-295.71.tar.gz 33058244 SHA256 d563a75b07068c7182809bab63fe964377961fdf99cbfcfb2ff25b471a3815dd SHA512 19d4c8200d9764b42cedf675bc1d03547177fc3cdde1cbfa24a7c65a0e47f393d253e3584a8976cbefdd8813918008faae53f8809fd2540b2df867add8f1034a WHIRLPOOL 9ed8987472a00a2005f1013c14a323bdd385d56ee9ffded8266ecdd14d64ebab14e493105b8099f8e936220a5fc2d14a442d00b7820482c1038817aee886386d
 DIST NVIDIA-FreeBSD-x86_64-302.17.tar.gz 32993726 SHA256 609f2abe8459714993f62eb6ee90114a26beecfc375d72ab1776b503ef549166 SHA512 6ee33ae0518f596a978e4cff9342925ee5ac7927dc3dc84ed0b245608b438729c2c96a755e786e0e27641fff1ac78d814afa90db1c118bcd7a877647e5e05344 WHIRLPOOL 2c741e87928f2cea8c65e8b9dcd0d43582fd2c68620a208cc4e751135d4a3513925c4c0b94eecb6935206becc7eeec392cf8524e8bb84a0d3ed8254101db4aab
 DIST NVIDIA-FreeBSD-x86_64-304.37.tar.gz 34210803 SHA256 0d00046c8463954b6c8e13e245b2619758e947389161a113aa005ef7566e5dd3 SHA512 8414efc3c4b2d654b960892178fc5bc3c6c1ea6fb24558887dd18f0a72fa02dd16adf228a97d53b34c679f61c0c7fdaf72f460bbe818eaeef85ae7d69a204b21 WHIRLPOOL 5db2fb3cb23608703e9e915ccb3324465a23832516990f7765fb5317203f37fe8f91c76f88578583eba749a3440b7b13a7cb95e3dfe855c4c54f1f884c861b44
+DIST NVIDIA-FreeBSD-x86_64-304.43.tar.gz 34225997 SHA256 5e76b1660639b2af2fcfbe37457043138f26698866653726dd37cbf4c2ee2ac5 SHA512 2827f484e9936436a279ac78bb7eaae892a01d1df045308b1af95889b0002e39e81672b404c4a63c9940315ce2ec0160d7a2398033186017fc65eb607b85289a WHIRLPOOL 074276d8a9684bde8e317674449dbad78d3a7d595ab811566f17f0c88e09f520ae26914ec7f99a0a38c91c21d920d0d013737d9e1906ddc39af0dfe7d4a8bf7e
 DIST NVIDIA-Linux-x86-173.14.35-pkg0.run 14028887 SHA256 2d26100f7691047e424e1614deca0f1d862da5fa69e04e967f0c1dbb84ec729a SHA512 6f752a33ec69ec05979e2cc8754c59377d248675ab3ec2a55212a97ee6591e80942a44b96df612ed1b41eecd2c7a0e49f464dbe251a74345ca6e9b8650dc095c WHIRLPOOL b58e84c02e0e151555ba48dbe512d4f85de4852af6ed98e4e10d6cff1ce52f5a5f509752bdc28a31704a9a7d3325790ed236c37aa31622d096d39507653121c1
 DIST NVIDIA-Linux-x86-295.59.run 34730118 SHA256 084bbb76c57d5c2a5b780322a95dcc230ec6e25b4f6c176574a93621399ce5a0 SHA512 91194816de17831e1abb4a2c80dac483dc78222a29921371d43a81626e3a6537468da663ca7a0c0c0a987d116801fce9f169d205beaaa061ab34c8e1818a7b82 WHIRLPOOL fe35d7f3edc5562fdbc2c6045889cb22cf87ff766e55ed68b9ebe0eeffe5c3d044306bbcad4b9086db921ca2489507ce6754803581156e118880fdaa35ec52f9
 DIST NVIDIA-Linux-x86-295.71.run 34738880 SHA256 e02dc300324eb953278664acfe5f4c3e6e4b7e45cc7b1c700c79ff368f2c9e4d SHA512 430b884d8e510dd2a722d4893f85a4f8e4227e3cfcbdd802ef1edfd776d4f6ca487854e1fc509537285fdc38c2d87474e3e7c9ed728871527a06227fd4306e3c WHIRLPOOL c65573d09be775e29c889c86bf8fcce2442d5e9e3d6aaedd6e2147d7fd12cf3e9fedc736f5cd90116ea1dabc169f7a42aa70e34d0c93ab6d1862cba13acfd6c0
 DIST NVIDIA-Linux-x86-302.17.run 34598956 SHA256 3525d3814361bd202998cea2962bb3d1bb3419206d02fd8ac30d61358c1a284f SHA512 e2ec7f9dcf566c9ed0085eaf45e40940830677f3d964077fb34681b6518a3a666fae6c7594e7eaea125c265db8ecf2087a3c309c0dc63ab9941d051ee73b252b WHIRLPOOL c81e3e8da372d3a217d0cf08f05d9aba468d75949d7a3c025595327aef7c61b882eb2bbef19373ebf2a79b5210f873cb7b13597fc6e9d3612791bec3ee1ca58a
 DIST NVIDIA-Linux-x86-304.37.run 39349097 SHA256 ab3174a0c9ab37a8fc3f4a8fc1121d72fbdd5e00ddecf44f7dbd84bb8d51b337 SHA512 82b38b6aabcce910bc5b9c4e80c7e1eeff0c969388e34bab30a6ae79fe58101b576bbdf3483bd9d846a39f124491ee3e4bb5c5592c3ee794b55f67f45d014719 WHIRLPOOL 79517d7258d5dd765c3d92fa2dab9f0d648e06c1d4db6799e87d888e7ce633f75004ec649712cadbab01f97f310d1c796f32b3ba697d60e1031890eedc40f2e6
+DIST NVIDIA-Linux-x86-304.43.run 39363770 SHA256 7c7f483302a0a5a828b8ef1f5a4a53f8e16d3b73d0c17bd61ed0d843cad32c4c SHA512 4915735ff744eb9b47bbd5cf3419452cdff9d94101fae0202f4f9fc8ecd0c3550a785bda9b374022c441f26f34f0bf10a080a4b3dbe2187b36eb1814e3c66222 WHIRLPOOL 0e4f5de98587652f65199f4085eba41b0bf2f14b74a0d4baa59d8cc09e7b0b126e7e49ffa4f948b5f08585b107a3de646a235159f25c1c8fe7809a6c2f4b534c
 DIST NVIDIA-Linux-x86-96.43.20-pkg0.run 10323541 SHA256 bc778062cf745ee4916de77a702f702312d33eeb3b6f379b63e4366fa5197517 SHA512 6fd8218dde3f3a3b49e83cd2e9df6aff502d17483ac5687c4f7009671a456bda008c12cde7d73a9d9999e6da777fe58f6093791cd7e7b10113c4a91deb1340fb WHIRLPOOL fd8e54f171bbf004eea9e7ea9bf0ad49386173e357221679f7144f6c9ec11d37d717f9b764a24a37bc10864b37e937a5dd7fd68319aa3e10edcdb835c4a2b1b0
 DIST NVIDIA-Linux-x86_64-173.14.35-pkg2.run 19767039 SHA256 5af64646b098021b550242fe8eb03817f862af0442023545d1295027f589595f SHA512 c6f4b56f9154af06bfef888be94dd7bbfe48e67593e901da13bc60bb0bfbfc7d00995ca61820419259e80fbc898373d26ef04c309ed6af3b73d13dc1245cc5e7 WHIRLPOOL 3c321157821751dcc82781db6fd0b9df6697d688280763ebfb11d8c004df1d5d7f975b70db9271797bfbe30d525dbe9b9a9987aeb272d854cba5a974c04d7584
 DIST NVIDIA-Linux-x86_64-295.59.run 58529480 SHA256 4b1d96389abd2b804ad470c5189142a02ee4c82c1ac56cea37ecb45e8051313e SHA512 e0c0c67f4906ee4d933d168e9d1b76d5e8f82182282cc5b164e0361bb846d64251505732830d1a777eac5d736e444bac0c78661d24ddf0d24d687bf6047d1f5f WHIRLPOOL b7618dd0fb0bbbe6428fd0217c44585566cc05c3757e2fa2bcf805509533e4fc089f8ac08ef7b60f90abf962d788e11c8d56f808a369cdb3ced2a32dbc868e19
 DIST NVIDIA-Linux-x86_64-295.71.run 58537709 SHA256 956c7660bff61c07a99cea2130e73baf1574907008d41d9462147aad6b83dcc6 SHA512 7eb21240ca44a648c081e38aab3ae6203ca70f2dd4ab187c67ef1f3cff9ab848f4040a640dfbd1f146135b37b98c6976943ff6caef8806a25784ff2263d23e8d WHIRLPOOL ea85d8fe42b15f7a7933b8dd3e31a48549a7dd411f21f60b69986fda8b2b4b53c6148194227097be6bc5323b448a5a8c452c784591e32281be576403e3caa435
 DIST NVIDIA-Linux-x86_64-302.17.run 58653717 SHA256 5cf9059ebb70ade99e5621c0a605ed5bbb6c274f7c52a7ef40342ceb41b381fc SHA512 2e945eab66328e0fd71bb5c428ada87fc210748e71605f1304d0b37abe92ee247834a22ce0a58e14bb799ee99e704dcf5daa17c036a6648445c30a90d30a25b3 WHIRLPOOL 49c141ad09ae74a8caef2e25d0b6b750a02f6b121b8951ef53ca43e6863f7bba243b380f9c8180b5d0f5fda6b009a32252e3972cd61c7f7626a5841e65541c82
 DIST NVIDIA-Linux-x86_64-304.37.run 64075318 SHA256 cae75158047d0b97ea48f269fd2903a6731f53b978a1065720343436c97ca9c2 SHA512 03ce52ad2f3ba232a9c9665ece40611a249ebd0bd74505adefe758064027f0d4afb4ea4e2411372183f46e372298d974c16708735f3d2b5bafe0038716d77bbc WHIRLPOOL 9a8f299db7e47a603805ce383bb30be520aa63acf91949f6ece7a8cac638eaf01d5e40b5f6279d2e243020b8d9c9af1ca94c6ca20c1ae5fa1ab3133bb56b4ed9
+DIST NVIDIA-Linux-x86_64-304.43.run 64094885 SHA256 76946e2fe4160cfd59e7a75fefd174a9c7e71c51cca6b88c40a16cf35947b777 SHA512 ff34f8d1aceb9190835de7bf9ae25cf973083ae747b79c9a18b0f5f01abc80ebe6a7355d0c17e40de0c8497f43a8041d524a666fc18aca324ad521bef5163f97 WHIRLPOOL c4ac780efacadc389e477f9c289fc5158826bf231d285b0c2848c4a797871575575453b08207ca24cb27afa18cc0c9eddce8b92aee8d35fdd2ab31a930b9d7ed
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18 SHA512 ca89961463bc705b1aa0e5fcbb284317e60e455d444035ba8f6a44cb3884f3a4b4c98ed5a37465d6f70a0eb6578a7d865b25f15a6b6f48bdbcb5aaca6e541623 WHIRLPOOL 873e32237ee1441625c1335e1d325649f139306a49bc87fc25afe81ec37671984a2f0bb904b2d7b435d5ceb52572740bb910fac32853627ce5583655178674dc
 EBUILD nvidia-drivers-173.14.35.ebuild 16653 SHA256 6286530ae409bd511486ccddf8f8e8d921d63ca51ed4d61c286d7e5da2cfc3a8 SHA512 c492de4f6655adb83ab237cfa43033e4a1881310d4181d69375cda88059023b5534e331095a77580eab9e83969ee7f0e84cf0e149dd4f3a071e70abbb0bb875e WHIRLPOOL f77a79d608dd341328bf61b0b991d2f0a73cf233fe8cceee54d9d9eca0746f97a5d45021327e7fc588c90742d731e56617e6f1e5a5923bfaf039c7aa3a4e4c4b
 EBUILD nvidia-drivers-295.59-r1.ebuild 18671 SHA256 d42fdfa4327223a16de942488016195f283d7008b3f4b9b9204719d6768c1f9e SHA512 03fbf6787a8266615b8fa0b9ba1c9874195e0593486d0f23cdc7b1579cf1a42484bbc6c72c6b05a869945a26dbf378f759796f168c7d1ce725e18f9e8648122b WHIRLPOOL da837778a9ec95676f4c24d188dd1db3f954d6ce6f45aa9990bfa3ca6b53a3df4264d463bf722b716b7de4e559cb0179ffbe65a0a4c1c2b6e5d50f366f216b1b
@@ -44,6 +48,7 @@ EBUILD nvidia-drivers-295.59.ebuild 18394 SHA256 68a437da3adb2eebf02a252fae14010
 EBUILD nvidia-drivers-295.71.ebuild 18400 SHA256 7853b44d515619eac055a18db7e5c6c298437c179857238d7aeb3a2b84bcea87 SHA512 e1c8caf80a010c563383e1d0237311e2058420aa6eefe5a33c83dc47956a62f713838ac4a3db94ed9d8cda11a274011304ee5a0a915d94159f68f5a523096732 WHIRLPOOL 973ee145b2777a8abf571037c079062797f8de5321710f07ec19d1d8360489b9764e58db698b1fac5de75fc1eeed601f7d41af457d5a51c8496bf6411a96b30c
 EBUILD nvidia-drivers-302.17-r1.ebuild 18683 SHA256 2789f605e6bfdec2a15be4d6a8265217fd82813794123834e158c9324fe8b24b SHA512 73ab9f6567fdb09dcc134ee744e6bc796270c248e4022c1120968fd26344f015c65790c5cb3d07f363612d1f2c3603c3bb5d83cbef725d525deb515be61964ec WHIRLPOOL 5db6d5f83cbfd0fbcab6f4a8534259b793494ae7549fcc56909b87691616d106aac1a16947ff30192bd90d40b0f6a44a6ce431a5309c47218d47b96253868f3f
 EBUILD nvidia-drivers-304.37-r1.ebuild 12465 SHA256 e612f041c52a8d2cf227974cf69f147de3e511b2412a1f42a7070bf8ec1000bf SHA512 c7bb2e905148973665f4f21dddbae6653cd69326bf753b7a28986eed62188707e64590296a1105c73f5a38fcdfc5ccf2ea666ea3d208b8e85973d638b1427180 WHIRLPOOL 94a9b5758051a27e5e98b1e9e5d94706a17bd8dae5b148825c14ab0b472f9a87bb890d6c797b5aa510457dcfe0936d70630fee6996bd3ea4e877df5ab1b29815
+EBUILD nvidia-drivers-304.43.ebuild 12462 SHA256 fbf48f34dab1f054ad6e909ebda358a983a47d0563bc27d6968d8ec00375f313 SHA512 5f969fd49bde74b096cedb0c57b0d539fbc7932585efd9c63787ad0a8d57cf06bfd551f47320482baecfd58fdfb070a352e8c819a33f371c9190c05c2322a42d WHIRLPOOL cebcbd821ab605885f632e72ce9362cb76f17c90f2007079fc7bd6c90e02abd0ca719bde0c64d5a191f0fb53bf9c3e1bb523a5c0a310833979e4a02e65f64d43
 EBUILD nvidia-drivers-96.43.20.ebuild 15268 SHA256 da92374cb260e0958897f444cb338870159714111c0230e20ea8fcfeac100c63 SHA512 5241fdc583f88aec384b3e2698255950bb84fdd781b051cc175dafc5a282e790d3d5dfa23734eab02b63a838f4c87227b89598fba6cb0e6bf9cd3fcf90042fde WHIRLPOOL e388f6fa286488f63994a70abcbc3077f552c6f58bc51289379bfc09b83dd9ec5a986d7f5d399c6d3d12a3b566e7d5f1710d3802d5472f5ed5ef38033fecaaf4
-MISC ChangeLog 82577 SHA256 ca54cda864185e59f964901ec1a2ff68d511ce9bb6852e82b227d5e45ec8aa2b SHA512 52dc83398f812c268e8adab2639e0cbc99eb2b73fec87815ab0e69c224cfa27996795b1409996dfa61f13e9f4e4e94bd3d6e07b4470071d0c6ada1ca6535888f WHIRLPOOL 844a6db86045dced10bf83897d8688c9e3f37790dcfcea9279ea7f913f0073cb4cd198eb02ff1554e4fc9a1a9faf57ce926f7901bc4d13cc405dfb3334222f59
+MISC ChangeLog 82746 SHA256 9adae74d5bec40298c434858ed5f1f34766bdb345b3496aeac98a8dadbb440d2 SHA512 17a21dcabc265cca0e61958ef15213f4bfc0895f7f80493aeb62dcd613740efcea293f8d6ee18cead372ffcdbda05cb4274bebfdc9880c0a71e40774e56e9b8a WHIRLPOOL cd24fc95c4a7d1f7dd9eb2f91f9bfdfea4132638d2b53e562b9b95fd7bb3c81275471f4318139910f28b47c761df89ff8a62a77f311edd6b1b7a66e258c4bc90
 MISC metadata.xml 871 SHA256 e956c1bf48a127db1cdec41cc0ad40ea59497d453f9aba5f8d6e354baec41bad SHA512 fe1168beef77ea7ec49db41a0da95ec073d866db8324bd4f95b789de8570341d52768a54ec61a72d7c11b9d075c8c6b169ac9f830ba5c338a3a288a15e4d9e8a WHIRLPOOL a63fbbb67155565584f194aa3467eb46d2c83402afe08f14fbd6b03a8843e0275ef47f7fd05892d285b6afdbb3f69b6e3a054fefa55f2039ab077cf74c8bd2e2
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild
new file mode 100644
index 000000000000..6cdfc5ba8daf
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.43.ebuild
@@ -0,0 +1,440 @@
+# 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-304.43.ebuild,v 1.1 2012/08/28 23:05:39 cardoe Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs 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}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	 amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	 x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux +tools +X"
+RESTRICT="strip"
+EMULTILIB_PKG="true"
+
+COMMON="app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	multilib? ( app-emulation/emul-linux-x86-xlibs )
+	X? (
+		<x11-base/xorg-server-1.13.99
+		>=app-admin/eselect-opengl-1.0.9
+	)"
+DEPEND="${COMMON}
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
+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]
+	)
+	X? ( x11-libs/libXvMC )"
+PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT=""
+
+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
+
+	# 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
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		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
+
+	# 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}"
+		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_unpack() {
+	if ! use kernel_FreeBSD; then
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	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
+	cat <<- EOF > "${S}"/nvidia.icd
+		/usr/$(get_libdir)/libnvidia-opencl.so
+	EOF
+
+	# 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)
+
+	# Add it to QA_PREBUILT
+	QA_PREBUILT+=" ${MY_DEST}/${libname}.${MY_SOVER}"
+
+	# 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
+
+		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
+
+		local udevdir=/lib/udev
+		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "${udevdir}"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+
+		insinto "${udevdir}"/rules.d
+		newins "${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" || die
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko" || die
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	if use kernel_linux; then
+		# NVIDIA video decode <-> CUDA
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so || die "failed to install nvidia_drv.so"
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# XvMC driver
+		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+			die "failed to install libXvMCNVIDIA.so"
+		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
+		dosym libXvMCNVIDIA.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins nvidia.icd
+		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
+	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-proxy-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig || die
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-debugdump || die
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-control || die
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-server || die
+		doexe ${NV_OBJ}/nvidia-smi || die
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings || die
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh || die
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		newicon ${NV_OBJ}/nvidia-settings.png nvidia-drivers-settings.png
+		domenu "${FILESDIR}"/nvidia-drivers-settings.desktop
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/nvidia-autostart.desktop
+	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"
+}
+
+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}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+	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}
+	fi
+}
+
+pkg_preinst() {
+	use kernel_linux && linux-mod_pkg_preinst
+
+	# 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
+
+	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 "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
+	elog
+	elog "NVIDIA has requested that any bug reports submitted have the"
+	elog "output of /opt/bin/nvidia-bug-report.sh included."
+	elog
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries, XvMC, 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
+}