Version bump.

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

3 files changed, 470 insertions, 5 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index a1da54966cd4..fcc547c0006c 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.431 2013/03/04 23:13:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.432 2013/03/04 23:44:37 jer Exp $
+
+*nvidia-drivers-304.84 (04 Mar 2013)
+
+  04 Mar 2013; Jeroen Roovers <jer@gentoo.org> +nvidia-drivers-304.84.ebuild:
+  Version bump.
 
   04 Mar 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove zerochaos.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 02fa285530b4..f4b092e851ce 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -19,33 +19,38 @@ AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367b
 AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13
 DIST NVIDIA-FreeBSD-x86-173.14.36.tar.gz 19167108 SHA256 85e45920e8bbb85b76da802800b909871c042cbab08d1417f6618032cbb062cb SHA512 25917609ae8f2c4623f21787ab751b090b693bc5335be30fac2eb3056a59cdc9b923ca19cfe85ec0c12c7501e15711c8f71d5e8dffd84a901ed8ea68bb781e65 WHIRLPOOL 566f90b08eab524e780c73ef3443c60d119202c02f6d78385be21df0d261293299cd31da39fe2554cac59cdbee207f2cba21446ad0cc4a04ec455f30a403dcba
 DIST NVIDIA-FreeBSD-x86-304.64.tar.gz 33320263 SHA256 e129d0d0e8d256d6328cddc4c18edb96c1e444c354f7c806ece4192621a1c1b5 SHA512 032de0524f2e68a06e6218f3737f55e16e6ae6ea9991b539bacabf4814a101d2f0786d8e2fe750d59ddaf5b5cee5b1527adedc44539d2015370e879ee8b37948 WHIRLPOOL f042065e63a5a74b2d3b586135072df77156481383a5cb7993598efef841859c3a7d9a7c6ad7eb83016376bfe5d2b044088918711a6304380a8ade6c808ab60c
+DIST NVIDIA-FreeBSD-x86-304.84.tar.gz 33644409 SHA256 7ef89301cd5ecb1bdc75fbfad2a81fa85d8d2b7d109a82ec5f92c2680530888b SHA512 58d0d8da3b8371ccc99db60db2ddb4da935af80bc69a82acf8337c330bd703f206792305f04b791d3a0c7d97274c0f8c96e8bc5c852ccc7620ee23dfbaa14f48 WHIRLPOOL 7c0366fb676e7a73bad11b6f3b624fd2bebfae0bafc5724c5d1dc7fc9f0f4d7538225768d89d3e365cb1e6504e7046796b738c9a73db2b6d220176f8f39dd0b8
 DIST NVIDIA-FreeBSD-x86-310.32.tar.gz 32541283 SHA256 3f00f5a13dc04f51b2a1b000ad53741ac6b81bd6e70258e7b9f200daf8f52b2d SHA512 f7d6e55a11cb8c44e5ddad00326942968800b671b6695303cbb3a689f843977f09c742705b4c44d1b77d4602229d59f3a713fbf0687c104c4220da34d6e45830 WHIRLPOOL 3ae11e4e4740a83e73ba028d6066c556e848956476e7b7633b3d36c6319a9751398d6b1a9392b279c0fec28277f355c05a06d9506159060a67ec8b29116711c3
 DIST NVIDIA-FreeBSD-x86-313.18.tar.gz 32592785 SHA256 515b8470dcea3e122403f5902ba6ce3d710d9ddc4d9edd581ffe85e184af989f SHA512 00f15def371cbd2c433b2cecc1f5ff455ea1b112951b3453512b88371f7fa25047e5409cdbd7e34b7c8e6d5b1691b6d662076737dcfd6239f60926a013a1de52 WHIRLPOOL d6a49d027a4cc66c05a246f84ca8360265ce98d50e1e35d4d8828f2003c472d2154eb277cecddd1eb39ecc44896795e529daa743f37174c0e1e2a84b9fa7bada
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.64.tar.gz 34247065 SHA256 9887e4147fcb16141dcb6b153ff71a28c73cf2a4c16b60e4c6fcb8586a1c5400 SHA512 31750ebf8f8583e82dd3211888e729dac866b73c9cce4cf666900f7d1269097ed1df9e30173c8091e0ed5196dd3d4d9b09e2aaeaef2936aa3f95fb673a37622b WHIRLPOOL 1412c1e9deaecd2f7fd086ef57afb6ea8b2252b57a4e69a71561768a6fed7e6387d10db4e4efa5c9772e2954bc0fd2c1902bff29a8b48ce6dc05e87ec913c908
+DIST NVIDIA-FreeBSD-x86_64-304.84.tar.gz 34592883 SHA256 dc68dddc753f2e21f485bf4f4726ba2bc2172d855b8981ae859990ed332f8a51 SHA512 f800e42cb89e27b58ce47d446eb45793d2f9a756b0317d3b667a74ef7425cebfdf6ddfa72626c57297eff05362fd09bb76d64d20cf3c17c7efe9366af7684fc5 WHIRLPOOL e19de4f58a0c68d41d5418144b8a6e57108114d28bf043ec55f3fe3c9d8e7706eb381d2c73cb9f1fae5e75cecedd11f890faa3f655ff09072fa8e2bdac1793fc
 DIST NVIDIA-FreeBSD-x86_64-310.32.tar.gz 33511666 SHA256 f0935abf74a1298471a5eb0ede56ab913e358b76935557d618915a97efda9224 SHA512 fae5fef9cfc1f49c5d2a2c0a36cebd3b1e95ce306a2ef59fe93b9536d64489bbac09d8e78d92b2cd7e66bbe7cf68b86b0431d95b84267cbe06f9c7e485cc23a8 WHIRLPOOL 3b4aa1363ef70940f7c85e5e3ce4c13c5976f774b191567f45a7944daa89d89d823710ae4441f6c5746b30578457a339f3aa9cd650c25d071662ca21f048126b
 DIST NVIDIA-FreeBSD-x86_64-313.18.tar.gz 33554240 SHA256 57fbf9c85fb19a7f2fb3c6c2f50421e70309cd3360c059a2fc6efc125681ff10 SHA512 fe2c0ec88b7cb5d49905dd082d46f3a4268dea78bf4dbdc6d82b60f1ec9998d478b4332de48094af7bb7b9b51eb6885aae446998830c28555521715db7a59dbe WHIRLPOOL 95e3c577b3831bda11f0ddd8ee1fddc2f1a3138db35c78277fe99ac6c75d9dca0e9b8acf59ca31413f11775772d82bef85077355796bb6882bf9804868361b66
 DIST NVIDIA-Linux-x86-173.14.36-pkg0.run 14400303 SHA256 ac246f1250756863be3a6a8a8f3ba92d4f0fcfb5dcab3a836b2af3a4eb8c96a7 SHA512 986ba6dca934100879d1e7a38a8085996ea0074666fe9cb135c4dff43602df34af175b54759576700051c33ef72f32d86f544df892c59f62eff0312a233167ef WHIRLPOOL 8e424423a8010b3b4476cbbbdb14132330a2f54b68cbe3843fa6367e86f23457c9640eb35d4b17ff437726d8176f21557848c4ef4c7632dfb1753eb2c9cd886b
 DIST NVIDIA-Linux-x86-304.64.run 39386363 SHA256 23464129f7ea5a00f724f67627206b322b6d08efb7134192a56ba50ea93d2252 SHA512 106e40ec6453c0f08c0ec926e5121357535395c5d97acfdaa3c1b95f9baa256d1797cde56e1fa696e267cd1d12fcb1624d6e60e28256d9658bfed12580669c5c WHIRLPOOL a6ab62b283963a417781d4d90c03f7a1b2afedb69d1e2e862bdc67c6e8148a29de396e362dea46a4024f65470ecc2f984b468df9ab784aca7327e80529af2bc7
+DIST NVIDIA-Linux-x86-304.84.run 39676809 SHA256 4182f09c6c7d7246a373bf616c85c8a1bc2c272e1f4e3a471f6e0f07f3e80e92 SHA512 9ce6ab3126611f498dabd2c042cddba91f3edb14eeee2a30f153c4243f59f1613deeb366dd462c3f2de927793cce9129b8da5c58c7828620d0e1f25bc8bf00e9 WHIRLPOOL cd6e11cac285eb6a430ccd031b2503f9c0303bcca57da0c693796e199db2aa227f4a0e62185b34375a3f622465979eed1c984c7209b16f07c6792032699e7c66
 DIST NVIDIA-Linux-x86-310.32.run 38844819 SHA256 d43e56486a53fa99690c7038005797699cec54ab5e2c7cee229340118616ac8d SHA512 523745e428874445fe2df65bd111c68707b378305d7bbeea6a94b01b13a1f6233b4e27d74555f1c43457e8d49692e786eab3157c2bd3e158228316534746a2d8 WHIRLPOOL 642d64eb1e62f6e305b89712112f54e8e6f6eee9726cad0544d7caf02307e570a2418482318df18fd1de2376cbde918732d96af5400634d150d4625d40467c3c
 DIST NVIDIA-Linux-x86-313.18.run 38865783 SHA256 58e5e2191890ace94849444f5d2de4c2921dfe02cd97825d81a128754ff4488f SHA512 70ec92071de3aabe77ee5304a4c2c1b7eda0e2b44860f63b05c8c004aaf748c18b40e5f7558dd6bcb99e1e394557a2c189ca462400fdde28aee408a64b8b7e27 WHIRLPOOL 3f6506e17414a78d4dc7a69e52e34d5172529d061dd8aa7b7e31066281525a0cbfefd846b2bfdb21820ed3c6a0c1348fae4e0d7d21c82d6633e284f5a0dfbd52
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.36-pkg2.run 20207393 SHA256 e7e3a23e80eb300d32b0203d360a5158162f5ce0f86be0ea6875e9a2b3ba4381 SHA512 c652f7333c809ebb3b74ce1e080cd506dcdb60ccacb0b7aa79d04a4f993964040edc6ff26673b2028a844052d1b313650aa1b4d0cffa35785ac0a9ada48319a5 WHIRLPOOL 22c0b1ea44ce3ce1636c276c1d0e0e5bc25c99556c207b16dfc42429008d968e5949c97c1ade3f8a17d991bb3b9ed302e2405dd216310e878e49c644891b8867
 DIST NVIDIA-Linux-x86_64-304.64.run 67695715 SHA256 b3c3bb7f136ccd978c9c5a511a02199ec2498c4243baae19ac68e5d905ca5340 SHA512 77241676900bf5f9fa93f5628ae9c5ffc35c41de31fbb9e777e55204cd1183d344d7ad5d00e52efe5caa91330f6157d9d2cba66764256673dbfbe61fe6797de3 WHIRLPOOL a8744fb747569e5106d486200231f0caf99ac3896b8cc358ea581486cf98506ed21b54407665acb461c40fcd89cfa04ac540b6c959856aaf14979abce75999d1
+DIST NVIDIA-Linux-x86_64-304.84.run 68030167 SHA256 8d51e0a8e5bd20d0add5dbacdcdb95eba05bc01d17c3bb247b5a1880feb0e0fe SHA512 741771b29061d196b9d686fc3d2bdeb7f0367b6bc146fb4d0769e26c36e82e2d47d2809f82feba3639557c0ab3cd75f854bd51201a13d102654d5a0b04a84e4d WHIRLPOOL 3529e7d8debd9c67fa495583f34c7b3e9ca7faa02c9e19b8e2e08aa125333dd17299bc528b75e9e99d3e36cfd109071451cb29137be3e7801100eab8c5d82a98
 DIST NVIDIA-Linux-x86_64-310.32.run 68342787 SHA256 e5f179a62d1a0e6a877f3f89315d0a28cb7c3cbceff7df13e1a71ab189ac3616 SHA512 c0f3c6327a6fe01e84a84f92578c01367abc1b7c8435d4485bb117874ac9156800b82e7f59fd5a3caf74d3a44b067b890ce12a0dc35efde81cc6ee6388b8b4ce WHIRLPOOL 480419d3f329808e73f5ff9556f05f02d7488eec4af91444f858d0347ab331a0cc75700361ba47ea4151cc549e716ab9f980b3bfb5bbea205fc1b4d12d0b50a3
 DIST NVIDIA-Linux-x86_64-313.18.run 68386461 SHA256 9aaf6ce2fb08f72b2ab4f7a2d9fc5af8216ac263fa4883deec3844f34ea7ba3a SHA512 d1017763f6cef96a443f9d7890ca940d742cd17fb8b1d926440483987e22d350a57bcce98962d6130c5e2ac697926dbb560f148f45ba7659ff3412443b53473c WHIRLPOOL 0180fff2e5e7bd9fb731fdee3c81e1b26a7962d989e998dc9fa67e4a836526e10e6de01cfc1e6650d9ff4a5cc334b5c27740df309b3dd403dfd13795c48d6f29
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.36.ebuild 17168 SHA256 2428f33337f3dcd56509f5a4977f407600f3f5f75c3c4afd16056991cdb1b60c SHA512 e267e8c79b09eba1499e0b7b9a51448dd2c4b84821d05a69474cc513fb9c6fea1710091e445cece1137e1479018c2bd122e7effb3a4cb97b6d8033e57d1bdbd7 WHIRLPOOL 3c98d6e95a2102100fce9b9ed85b5fe327bbbed099cff2b176719b82107b7fb8f87c81bf250d4f9bfceefc81fc914fa719c975adaefd5ba4c1364134ec91eb56
 EBUILD nvidia-drivers-304.64.ebuild 13183 SHA256 0325daacf979f44ee8f4b93a0cf911a72d2dc1a5459dbfeda5ee65058a137fc1 SHA512 7615f5736b3d09a471c6b9f88fe35168df72553167bdf2d54b3391b4cfc6a5a7e727d27eebba961112a66f34ed0561c0e0c40359dcbb8ae6969f7c81e2ab2d0e WHIRLPOOL 0d15750d9bb21a046ed20edd209a236452798fdbbda164ba951d834d4c031451171e9a3d6703f69d45401c4a296812915dbf2287eb22d2b74ddbaca72fb34f93
+EBUILD nvidia-drivers-304.84.ebuild 13182 SHA256 c947b7289e3899eef1768ade0f1c2b27f528075b5a798a3179123adae32b4bf1 SHA512 0723d21557666389a1e393494a1e8f4cd4116d21178bea3884f4377dd98bc74cdaa7914fdec85e67db061f22d6ebe343ff7f7b127be9bd8e65d9634ad625cd3e WHIRLPOOL 2cb00b60cf79127bdb8616de03d2e7e0abd0a94bdbc6404562ca7aed32c17a58b0aabf097acd3f474be4dddaad9d4e97e852c21167f4391b30d0dbe52b11a646
 EBUILD nvidia-drivers-310.32.ebuild 12773 SHA256 4d3c9e2045cb7a4f2bf60c222ff3bb894b10f11d36a80ebfe8abeb2c00d624b9 SHA512 d8bc2111d17b05dde2a7f4ea4ad2ab1658991d39de6803fe8bf1201586334c429428ec17d1554a433e0a305cbadead0bcc1024db18407c389d1dd7940ee05816 WHIRLPOOL 23b2992b99cfe5cfd554d9f8576567737a3e4ea799a9fc32f07ea55bffa3075adfe47a099f28fd46003d2ecd05b854c77461261b62b26255a4710bf2e77c3392
 EBUILD nvidia-drivers-313.18.ebuild 12775 SHA256 95b408b9edab25bac565a1f296117c20e429539dbbbd65aab201da2e974eebbd SHA512 12cc2298c246fb79d7b489179396d4e6d2c6e18c03134fd68b98f9c318c46704ce589281be3c35f9dc394921a3f83acfcddbac9b6c87a7aa95e224e515d1705d WHIRLPOOL a03da875b3c8ac2aa4830057ed1dcbd972827ec31ca7e79fb386efd04728edd1209d959cb45175fc3ffebbe420e6636f8b4f73964bfec52d2310a03956db8dab
 EBUILD nvidia-drivers-96.43.23.ebuild 15785 SHA256 d507fed11fb7bc4b40298cc08fefe6679175f408ee52bd26b22ec1e8e2f60a93 SHA512 7dfe1637c820fc03d8488fcd36d8150c17c36051aaffdfe20a57715cd1c3025b5e43a0a81596b5b43be50ec022d2d9ad7e3eb782ce0e99bdf3d8925ec7eb5fe5 WHIRLPOOL 465025051ab07420fcd8a49d8fe56c2d5a623d6b1362a106bc40ce22ba8545dd8d529e8857d0f1904a7d88c1ea9a3d55f3b3b8c49db28f2883dc57385caf7927
-MISC ChangeLog 90113 SHA256 9991d6df0fa4d8041ba457c24caeb4eba292f7ebbd7eac3c19b7f617207ac391 SHA512 6f8b260feb19b9585aa3c6c182c74734e7d208310cf6082cccdde7544c6af7d65e4f2e1e6c0a53d315a1bbd868212a57671b8cff569409cbf890621471bf74af WHIRLPOOL ee93aa3f29aa33b891da344a558721ba3514d45acb9e983b6b5198d8d8ca4ecda242439fd0b1cb851fb37c26513e315d397bbc421f2f7ad42bbc57c970cfcb08
+MISC ChangeLog 90246 SHA256 41b6d6ca938b6b0303c97f010041dc29f6ee125188e30dd7eab52899607acabc SHA512 033ba440a5e4f455ceb1c4a1b7757bf8ad5f82274bb1e99f673f3e2fa0368aa50febad7d7059cc039dd3523cbba88e303cba1474b5b11d9fd2eb43f84702145a WHIRLPOOL f5cba8f92b4031844102bd4bd2a46ed32c79352d78c8561f1c581cdbc8d29d4a539be6d9bdfd9447143f5104f0bb941d38e2d41db633d0f883339b864c2f7745
 MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE1Kq4ACgkQVWmRsqeSphMuyACff+xw3R5svssCF6GBUSC+QFyt
-GrkAoIEQVgqZ0T7HULcaF8dJWPvxAlni
-=PDcv
+iEYEAREIAAYFAlE1MeYACgkQVWmRsqeSphMZkQCeJwhTZv4cQqgq6EjwtwzzrNg+
+tREAn2IZ8hEn/SiVq5b36YXAhsIiy3Xl
+=M1ZE
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild
new file mode 100644
index 000000000000..c5f217fa8d8e
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.84.ebuild,v 1.1 2013/03/04 23:44:37 jer Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user versionator udev
+
+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? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	 amd64-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	 x86-fbsd? ( ftp://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 pax_kernel +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.14.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]
+		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] )
+	)
+	X? ( x11-libs/libXvMC )"
+PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
+
+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
+
+	# 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
+
+	if use kernel_linux && kernel_is ge 3 7 ; then
+		ewarn "Gentoo supports kernel's which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.7"
+		ewarn "<sys-kernel/vanilla-sources-3.7"
+		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."
+	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
+
+	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}"/nvidia-drivers-pax-const.patch
+	    epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
+	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)
+
+	# 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
+
+		# 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" || 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
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png nvidia-drivers-settings.png
+		domenu "${FILESDIR}"/nvidia-drivers-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"
+}
+
+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
+}