Stable for AMD64 x86 too.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --ignore-arches
Manifest-Sign-Key: 0xA792A613

5 files changed, 12 insertions, 930 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 4c47b7dc13b3..b6795de5a31c 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # 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.514 2014/01/17 16:14:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.515 2014/01/23 13:14:35 jer Exp $
+
+  23 Jan 2014; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-319.76.ebuild,
+  -nvidia-drivers-331.20.ebuild, nvidia-drivers-331.38.ebuild:
+  Stable for AMD64 x86 too.
 
   17 Jan 2014; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-319.82.ebuild:
   Superseded by 331.38 for GeForce 820M support.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 781743c47693..9c66b1ebd4d3 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -15,39 +15,29 @@ AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367b
 AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13
 DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
 DIST NVIDIA-FreeBSD-x86-304.117.tar.gz 33973583 SHA256 ab07a491b0a389cca89c96e6380625b01c681ed34e78538d15b2dc94914a06ec SHA512 ed446c372103cd78b401b0f915ec2af7a8fe397fc5e8716f5820c9a78146285a534087cf14c75219a45439e0447d579c5426a340b2264d7783ac7d613d9d95e7 WHIRLPOOL 85ba827e7a7aebadbf784f53e859fd397ce3192c612ca982be4fdf71c5502d915d9056a4c1ebedcdede71ec0149223ad8d2a8d0c97387f6c1f268178a49b58a6
-DIST NVIDIA-FreeBSD-x86-319.76.tar.gz 34422598 SHA256 0a0e966d6dc450e9ed872e1875e27ae8c5e306b75c08a6e75c98f408c5606b2b SHA512 df5c4f40a0c83b9e6837d766b6a3121ee28d5754b42d7da314ea93c9a95687c32dd84fa6fc903518707ccf101dab08fb5efc852764d505e82d850361dac60296 WHIRLPOOL c59d42a2dbfdd320b0406e969027eeb11c6b24dc1a8e14a4282eaf4d74fc9ade082ba712435bf463bec5bebfd25f92d9ad280685776cd72ccc5709743e7f5ccb
-DIST NVIDIA-FreeBSD-x86-331.20.tar.gz 55524337 SHA256 dca5c90a99ab151d97c1cbb23f37c7834867ce32f88c6916b2295b3945363b7e SHA512 56135d442c6404a2802e3c47a6b3ffbf11066ceb43bb4f3151e94ad802ea5b20fa007d68e2b0736207c8def988bfc8c522a04cf37efeeea8b8f32c78feaa13bb WHIRLPOOL 10d071ba491eb1f74398fc6ab7ecc80bc910950f0710abb25e7a97d9d43f65ddd4d67abef1dc7d939105de374ce14aa71640ac62cd0e2d7d3005fcf400d97fc3
 DIST NVIDIA-FreeBSD-x86-331.38.tar.gz 55851205 SHA256 e4d5932bbc431135285f9e6dba88100688ba19621dc18df185bb1e354584c9d1 SHA512 f7f08d0570fd5d512eeb77bb8bc2aaf104bb0069b430dfe584cff32ec1e9da0af2f380fc52c59c34bf769a0d8b44ef05492beb80569fd530ca98beb763952d7a WHIRLPOOL 89470ec1edb54698faf5083c52532de09e2eb1787d2c5c8ded492350a6ca3f487e70168e9e198005076e6bbe3bfa76e6e97023dfa389f1b65f318f725fd473b1
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.117.tar.gz 34938457 SHA256 ded26b83918308b63c6cf75c963e016f6db7d9756875d071ff4f3754e445de0b SHA512 cc0fee07a521799822a26f46d771f473d667c0fa81bfb55af97818b7dbf160aae931afc510017bff73f2d05ad3300db985a0229c4c29c8ad7f9e7fa94c27c5f3 WHIRLPOOL 3775e970706849edf143393065ed7bf8a09c692304357e59ead905e6b216775b095ddf998faf05a5886daeaca94e3f7c45b7950f93913716dbbded3f3efeedfd
-DIST NVIDIA-FreeBSD-x86_64-319.76.tar.gz 34828707 SHA256 4866def3a2438555b91f9d03061a224a74dfa5b7c4615f2f5a9e018743c815b0 SHA512 a18b6d1aface4163b9567d669512a3f5ba649c62c42630be8982f7fc3c607923a21f77e5da77fecdddcbccded48bac91d7201a8ce96ac500348da60e772bb350 WHIRLPOOL 6a23f55e1ce6533a74aedc68695817c703e90f5d875f25c87e1f681e437ad72d40ab8daf47f844a2fcda28c6df4ea59b432c39b95631c2c2c6ff71c2d9e2bb1b
-DIST NVIDIA-FreeBSD-x86_64-331.20.tar.gz 46616176 SHA256 6a0396e828427fb928f18faa72288208702c3067c25c29ed3815a68a06e244c5 SHA512 29a3dfc4e4cd88c64c5ff9cd268494344ca0f56f7af79a57f1cdae8565f1199b7c577c795e986d3a8c223b640d559c8201b4c9dcab105d2ffe99035400ac2260 WHIRLPOOL 126e4320e8fb3500b09a28889af5155a75122c59f502da08f01f037adadb1cc3f08200831eb4b1da896c0a09f645ad8c40ae3ceafb93fb84f13d2fbb0bc79e6b
 DIST NVIDIA-FreeBSD-x86_64-331.38.tar.gz 46961827 SHA256 cd01441b324ec78dce6343e54670222dcbdd5752c1fe6eda3af0dee1b07c11ee SHA512 6c8924efca6c4dae78a71a7deeaaca05c4e012410d633c3c35c6be4afa4cd081d3c5d0f4393d4570e041bd215f0c7b1fed66c863a835e6ed5ddda91008bbd331 WHIRLPOOL 0aaf9bb60be620089d996adebb89cd7dd1761bd214f852d803985ee2cf76955bf5a2614230f57bbd138e5b9d832b3f930500da0b3dc235888f6d03da0ae4b8e8
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.117.run 40086859 SHA256 c343207d531f21ba1cec24a085845577a278bcee9e7b86e4ceef8f6f634c4099 SHA512 53e883627eeb26b84531f0df2cf801c91ba6731f54838e0dae2f2b776721bce85147526f1d910d4496a098f50213f901730ecef7196ac138c52c286d8d89f47d WHIRLPOOL f8f1d0866b8041d0e229015b03ba049ba933e11cdae76e3d3c237720107fecc78ed3932687ef672753bfcc6cb71712fe727fede9c2d51e07e17a70e20ddf7bd9
-DIST NVIDIA-Linux-x86-319.76.run 27823897 SHA256 d4e3de2ed1da0f4ce8230f8221954009467769cc170e43e83e352080d7f7d2cd SHA512 0e949121a7cc1978ee9af8caf7c01e7f2fdcef38101d48cf862d99ef006381ec0ea6aa5e63764b597755bedfe4e5ff3e6f02d08f2915cbce4c75e81fae812d23 WHIRLPOOL 9e5c22e3f34b6efaa43a187d4e4597d4912b02900c01142a0065af1c000160494e1053a2f1c292fa821901e5f4fad92bddc5593498f5ae24b30ed5918cd52cf0
-DIST NVIDIA-Linux-x86-331.20.run 37034614 SHA256 7ad6b05d31e790a938474ce832488f3c68e2f388503b20f7995bdb7bb5ab9745 SHA512 e42cfdcceba7f590e0fa6d8a99bf0c80143dc5bf5af21f26ce65274426c4eb3dbd1ec6864bf4edfcfd6f463453f06f44fd67acfcdd545764741a9620381865d2 WHIRLPOOL 4045a81ea985ae95f414fa2954f281e1e0608ba0e43d35613ff667adf3e8f266886dc4de25ecdc153be8f7087bcbae8ba0d1c484473083a3c2ce9a07f5c3e515
 DIST NVIDIA-Linux-x86-331.38.run 37020075 SHA256 396e4d8fffacd271937ef57dd90ec2dea3ff32ee9f1de73ce5370a6e29382bf4 SHA512 ae071d404a07754fd3eb4102b0d5d4cf2ec92aecfe65b5f618650f477f78dfa7d776f6786d0b53df2e0f5f00a8fae330bbfbe3de24afbf50ebffc7b45b027e2d WHIRLPOOL 95348fe4c87af0eadc998859f0e591899d18c9b1c52e40c6f53beb03393a2ef2e372f1a239c414bd003dd35520bf2265853ddbca6dbeded34b47150310a64cd4
 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.117.run 68548224 SHA256 0e5a751cf12b55057c00ccf53d05c8934d5eee49c5f8b3f33c5e11e2c6989e6e SHA512 24288906ca60bd5c3fd31fe501c6e077e2d67dc1d84165ba30e8d257733e236130a517aeda832f683091a4ec2eeecfb514f064571a5b58389a9042f6be679520 WHIRLPOOL 36881a4611d96f7cb79bf1af3d8918242daa5e21ab578561d5f86f445241429349516e8ce2d31f23f2c3ab6dc9b1b296948c930a5f063d3fc9866ef6de4d80d5
-DIST NVIDIA-Linux-x86_64-319.76.run 48955420 SHA256 0484acfd97d742dfc411dfde9a519839d89596f70dd63b2b4b65a9cb5bf5399e SHA512 a2ef6ab86298d8226368eae4dc0ab2a0a644b24e67e485c0192123105bce04e79ac16ed97f2df5e5e2e6affc078779c411040eba20afd31132d210ea97189f1f WHIRLPOOL f6206e120c112e7811d2ede9a8f8f7bdff1c6438a0d773bcdbea4f612490f37ba169fa573bf0569e7d0936b04ffb0ac97f8e49c02dee66e9a85cea0224ff314a
-DIST NVIDIA-Linux-x86_64-331.20.run 60012677 SHA256 b8803906402354d201d3b9bc21938a0fe8a7d76e93e486fddaab340df18092ec SHA512 96c2858fcfca05e68683dbc3c677194d1ad30d179cb88df445f32bc68e98b5964315336154f4a693ef1e385e809adfc3795e19b2337f4c1e93908825ee7792c1 WHIRLPOOL 66386d85ab40dd0a20a81f44e7e45b94d94bf4cebe01eb13467a6d6eed27df758d69559e069d479e888374d695290468fb15ff60159346a00e2bbe726d471866
 DIST NVIDIA-Linux-x86_64-331.38.run 60164869 SHA256 1015ac65a85ba39bdbe9e6bac54ae7ce3b2441fc7512909074e991242a46cf34 SHA512 adf90617b17e2560aa6b2ead236af02eb76f102db284c66b905254d926a881fec5a1302340fa743d44cae53e906d413a887b1dc121f1bca3aa1f861c9199fd73 WHIRLPOOL 0c0a38118032bbcd91115414d27cde7c80c92864788362ec38659239e1cc3a94878cb12cb803bc7bb89b53408730aa339bb646b212b56d448e78eb9f0ca4d064
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.39.ebuild 16615 SHA256 df85299032940da5c09757185accdfdfc65c9beaa6e07a5ab7224122cbf62521 SHA512 c939a4d4f8e945ef5f90a7842e7110eb18ea5df1b1c9ff08e703b7d744206e0fa49e833f5780cb3f3435652f5e3b5743c74d0d44b7804caab6364236cd5ae6d2 WHIRLPOOL 8df9736aa00dbe6e2f75cb7994e9cfbef635d8c7c451a3d4248929e0b73bd8e73d1b316a5971757b56b1aa40ae3794b093a3adbd7eb840c568410406d9e85c6d
 EBUILD nvidia-drivers-304.117.ebuild 12594 SHA256 7d4ccb38761ae9ca4ac6875616547f6953c3f1cc11f48c969679ff4d005ff5b0 SHA512 b4148b9d611bdb6d6ef8dbf1989f44a526b9bbb4e2cb8ec8b4dc10bcb35a44ffea3ffdf235e5321a7dcd16cb7eb072350ac33a8c61445d5095abae360cee4dba WHIRLPOOL 7ccd6ff398790a4209b7b29adb98e7fe353d9fcdd4f2f7fd3b499cacaeec61fd2279ec6b6f06bf7a639fca115ee4aff50443e8ef95aacac6883284758acf670a
-EBUILD nvidia-drivers-319.76.ebuild 12201 SHA256 43b77e20fe81733878209b8d8244d9a883b9d9c0fe3dc84786cf04a06e842ae6 SHA512 af232e40e385a4d779fdb2784b274f5b55cb367d80eba06ff428529c5a3003ed03231e8b6c135cf1712787e921132e9e8c4f085cd7af1cd6b039782ea0b74903 WHIRLPOOL defc756eaa6061d40c0ec1cd8694bd0f43707e0e7d7d189b8cc9117c0f2148c655a967818b533dcad159e3323ad5e614c2e49a71571653199e4b241bccdadbfd
-EBUILD nvidia-drivers-331.20.ebuild 12282 SHA256 28958e1faff6850d74e7131df5ffbc820010a16fe815795bb9387a50bf7c79c5 SHA512 482944da5192e199bd98c72716e52c882147d79862b151166e5de15200b794578762118ace9d4d102def7f1aa6964e48281bd8efcb0470ebd2ccfbd4930d3e2b WHIRLPOOL 31148bb67660273f672353bc417cc9b34cbdccb0cba6a814cb477390bfd285a7677256206cb3d6d791f07479499dfe11457cc860d539a650a36f317d84020cf6
-EBUILD nvidia-drivers-331.38.ebuild 12284 SHA256 460f6d6a31c2dc1653b1d4ccc54af9e27e2ccf7d214eaca73affa299cb503fff SHA512 23c1adba79aa8da3077af2dcce0484182d50633dac0252937fbb3216d4d7837bf313269e033ea572f5e465ecae246a853df35a7f10aa4df8e95775f5371d1c54 WHIRLPOOL de4f76d797c26335204ec7d5d90f3fa703fa90b985f09d0a4f4b8c767cfdb2457494f10059d5057296df160b75822785c3b9777dd614407118af90763d11b676
+EBUILD nvidia-drivers-331.38.ebuild 12282 SHA256 1ae32d474538e98e868e314c667d10a70d9f963dde9479e074bbf51be0003ea1 SHA512 4867db76669a90d26a75eb0f15c4c50d270fa47418d223672429eb2ad48e8343f9984ac718de8d07aca11f21e781609c7c2b3a61fcf588d2837ed1e832fb8597 WHIRLPOOL 09572a65a59eb20276f92ec8f610d73bc4a0d563afc6729c0db666f788ac1679c4f05ba9ab864e8e95b118d1150af006df1881cfb0cdac77da53cb2a9f3f0a9c
 EBUILD nvidia-drivers-96.43.23.ebuild 14882 SHA256 f113d8f0155e54f35ba9ae96e9190c9c0c008f53422bc4e4b07d20ac25efa917 SHA512 6fce1ad80cacf25c9c28638255c304c6218d91f13c7b5f3741cf0a10636aa449fb6241ddce211b8be92005a719f6d1e8cb28315a9900c4774c6420e3fbd5eecd WHIRLPOOL b87d4b6618b0cd355c5f9884eea353c1f0741b71b3b4cbb5e5ad985d1121db44fc2e77bffa361e82d7ab761eefe4b78c40498aa987a7ce5927a80bd868c4d53d
-MISC ChangeLog 850 SHA256 d3da7e9325f45551e78a22579b18527c90489f3af58290e05c4535ca4bb25f05 SHA512 c0ffb6cc34a8f3af53f6e06e5e0167b84abdb8f8a58973f1bbc5b01c67bafdfe44db57cb38ea25fc640e89a759340aa744c65affd64a9b06d7641a4dbff1cc7e WHIRLPOOL 922d629b744a0001f05ba0647ce70f1cde1bcedf44d5ae3123b4e72bf66cd9ceae6476c4ea2fb339f74a7acd22f4ef8d6a7c253f9c146c85f8082259f3358dae
+MISC ChangeLog 1020 SHA256 a3bf5fb5c913f71b91b0184dc446a8f122ab4c24ce47839bc99f54dd5f1ab54c SHA512 f10954df19f1a809430c77b77b8601c6192e02a1324ab8680dc1969dd7a578c222397a195f00b4ada9d297cd49ed7026bb2e929d6e6fbf37d239589fd9ac54a1 WHIRLPOOL 4ecf0afed1b23330731ea730fe1dd81ff1ffe56380b613cb3edd71ca72662fefd96456deb49e4d787cfe9fa27bcc81c6ab750b4bb28f17e5518d152da3e81203
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLZVs4ACgkQVWmRsqeSphMKfQCdGom7jXmZmgj0v/+kHRMDTfx4
-9UYAn1/Y1oEEAbiULdMzqeKOCbuhrtfw
-=qRIM
+iEYEAREIAAYFAlLhFbwACgkQVWmRsqeSphNm+gCbBFRxqKvsrLf1wcJ6MDsyM4up
+Ii0An0fF7yL3Y6/WYrQsEk9A5AFA0+23
+=H82C
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
deleted file mode 100644
index 971d25a2fa69..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
+++ /dev/null
@@ -1,454 +0,0 @@
-# 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-319.76.ebuild,v 1.4 2013/12/31 16:01:26 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 X11 driver and GLX libraries"
-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-r1"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
-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
-		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 11 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.11"
-		ewarn "<sys-kernel/vanilla-sources-3.11"
-		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
-		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
-
-	# 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}"/${PN}-pax-const.patch
-		epatch "${FILESDIR}"/${PN}-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
-
-		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
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia || die
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.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 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-modprobe
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-		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}/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}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		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}
-		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-	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
-
-	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
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild
deleted file mode 100644
index ce57c692ddd1..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.20.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# 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-331.20.ebuild,v 1.7 2013/12/31 01:19:34 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 X11 driver and GLX libraries"
-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-r1"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
-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
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.14.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 13 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.13"
-		ewarn "<sys-kernel/vanilla-sources-3.13"
-		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
-		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
-
-	# 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}"/${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
-
-		# 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 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-modprobe
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-		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}/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}
-		else
-			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-		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}
-		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
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.38.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.38.ebuild
index db26a65c2f5d..b8db5bba02ca 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.38.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.38.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.38.ebuild,v 1.1 2014/01/13 17:14:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.38.ebuild,v 1.2 2014/01/23 13:14:35 jer Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"