Stable for AMD64 x86 too.

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

6 files changed, 13 insertions, 1376 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 2847d3f5ff10..b6da62ba27c9 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.499 2013/12/03 11:17:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.500 2013/12/06 15:53:20 jer Exp $
+
+  06 Dec 2013; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-304.108.ebuild,
+  -nvidia-drivers-310.51.ebuild, -nvidia-drivers-313.30.ebuild,
+  nvidia-drivers-319.76.ebuild:
+  Stable for AMD64 x86 too.
 
 *nvidia-drivers-319.76 (03 Dec 2013)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 2b0e679d5323..69349233bcfa 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -14,30 +14,21 @@ AUX nvidia-smi.init 664 SHA256 c996033b81cc1512d8370d62575a0ea0c694f6e1b91cc948b
 AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e WHIRLPOOL cb9995029cdb2fe1bc7fe5ae54041ee5de8da86bf5eb3616d062475e56c44d436e1e66683ecddd986fc5bca5723d88da4b1a42f65f3cd7e15636928bd21fce14
 AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13
 DIST NVIDIA-FreeBSD-x86-173.14.38.tar.gz 19603538 SHA256 5e2d8e2151240df06632d9fd42bdb2ecdbf2ed8b29487f84f0f90a68e3f08185 SHA512 4b3d94e1d9718d651025410d32eb93c0536bf72bd9963671ac063804f9d32ea30aeeb691638927b7045fa7f192a93f312e296bd1ac51f226058cf073a79a0c6d WHIRLPOOL 02efd3e25bae76c89f647ed10ad5398702ff5b23723619a90e68f4b4c0155d273ff89e5397ddd6dfff0ba8a23691f173ccedcb8f247b60a919848813b560e82c
-DIST NVIDIA-FreeBSD-x86-304.108.tar.gz 33658984 SHA256 75908c8d062c8eeb1bc32ba1497485b4528f164bba2b2f6ba535e7c39ff04d4a SHA512 f16a742aac04f4f9e69ae466c5ec5d3a050bdbc10c70310f9d34ad3a553df02718e47f4b4c1eb9d1c103886959a787bb931782d9792f7055234d80c99d02f056 WHIRLPOOL 25e0e929c16b62669c105d2f8d9a4be3507cfba4088c6af63f3aa0473e72e1e8c05be7693bbac0e3c0a7f8e04b6abf2b400a2ad9f0da56ba7caaf96cdb3cfe88
 DIST NVIDIA-FreeBSD-x86-304.116.tar.gz 33666829 SHA256 8bcc7ec09243b8a201ebb104da0a887f6d842362672d6469065ae4f92a0b3a51 SHA512 a35fef1255a06f64ed19370aeb1e6a3eaccb17a72401a60ae7659122764dfb8fcce1ad97e3472d1e4bb1ad0e4862a2bce82f3cae8479cc16ca666246272e52bd WHIRLPOOL 345ff002e5e6fd3eb3762fbceebe7e88ae3f663733dd26a2e6690ccb5dbd6df7bfc6a42c4c668498cc45d5ae6e4e7bf765516b8a18219ffbfb95dda3a2449beb
-DIST NVIDIA-FreeBSD-x86-310.51.tar.gz 19512752 SHA256 95772b0b31a438f5f58e15c09d752a0dd7c3e98afda60e7b8239ebd2557d43a0 SHA512 9060d16e38c3edd080328dadc03df0601be76a79fa5610024077705c2ff177e6c7dc4e9a2c5fad6b58ef77b2c34477408a377a4dd12fe7ed47fcd48199bd572f WHIRLPOOL 151d874e61880a2eee146ca51d20a66c2f563b6c2e04c3070a1e6309c2a572dafdb18a6c8e385a2f767d652b2a236e5bd3a355e9abcf23d750fff5d2a9371817
-DIST NVIDIA-FreeBSD-x86-313.30.tar.gz 32591892 SHA256 1e02831fbaddf2f27808ea26352d835417f59bcf54ddb3e9c0f1d7b76dcb4666 SHA512 68cf61fabf707dfa1225011cab3749959ab29f09f611347eb9f9bd55065012d04382998e67091c4d3c1af9be21be6381aef9b6414448ee15f9a36d44448f5bf8 WHIRLPOOL 71ded70f45e880db2c2850c596cebafd004adf89f7131adaf324d1d38abbb5457a700bfa9e671bfa144515556f011df8a37fdf22b78b879f39007be6487f060a
 DIST NVIDIA-FreeBSD-x86-319.49.tar.gz 34058374 SHA256 668615070ea7fcf31588ab256c2708ae0570dffc009d153bf28183f652d14719 SHA512 fcf56916a3717590ada2fc778cf0d5ded6cd946528b115f36fa2ab93e1f08690bac83d4ecf6c9ae672581991b3399db9187073f65169bea72d724a4a1eb42ed4 WHIRLPOOL db2f181dbf9a9004c58535f305ccb16e6d3472375fdd14363716b04b561719a21628634df7a6d8f0b7fe939dcf709660eda963194c7208a37c01a64b267845af
 DIST NVIDIA-FreeBSD-x86-319.60.tar.gz 34097038 SHA256 424b9d016dd6d243c995e35da573bd536749e49be3d40f8620f9c4e820f72d78 SHA512 0b5add0213ac6c142ee6d2156658c8a8e06a6d8b18b63554704354741087af630513003b1482393827b387c3e24a12dfe9f5187e06fca87a535bd8b6a418ee38 WHIRLPOOL 6e5dd31087884e911ab76eaeb2a6f23e582506673ea41a183a1e583d218a25abf14284262499ef3cb52a8d3b448a8b66a8236d29e6fa81480a54d763a8174670
 DIST NVIDIA-FreeBSD-x86-319.76.tar.gz 34422598 SHA256 0a0e966d6dc450e9ed872e1875e27ae8c5e306b75c08a6e75c98f408c5606b2b SHA512 df5c4f40a0c83b9e6837d766b6a3121ee28d5754b42d7da314ea93c9a95687c32dd84fa6fc903518707ccf101dab08fb5efc852764d505e82d850361dac60296 WHIRLPOOL c59d42a2dbfdd320b0406e969027eeb11c6b24dc1a8e14a4282eaf4d74fc9ade082ba712435bf463bec5bebfd25f92d9ad280685776cd72ccc5709743e7f5ccb
 DIST NVIDIA-FreeBSD-x86-325.15.tar.gz 34164781 SHA256 745d8454833d1ad59f6480ac2d1ca744862e4e711e16deeebc0d04ff86925c4d SHA512 b1ce1041d7f3a926c3e62e398a618063e24675cdd919206c11e556f38d3b0078233ba31207d04e9d94e26bbf5eae4d43f8db457e7ac4fecfb8d407d2dbbf3040 WHIRLPOOL 9a37ecaa745ab9ff80755f01100610f85467fdfb55f5568dd358cb39302c0951edd91d518f1027bb0d43628e575ff9c1799ad956b9e673a31d38f7f3db125c63
 DIST NVIDIA-FreeBSD-x86-331.20.tar.gz 55524337 SHA256 dca5c90a99ab151d97c1cbb23f37c7834867ce32f88c6916b2295b3945363b7e SHA512 56135d442c6404a2802e3c47a6b3ffbf11066ceb43bb4f3151e94ad802ea5b20fa007d68e2b0736207c8def988bfc8c522a04cf37efeeea8b8f32c78feaa13bb WHIRLPOOL 10d071ba491eb1f74398fc6ab7ecc80bc910950f0710abb25e7a97d9d43f65ddd4d67abef1dc7d939105de374ce14aa71640ac62cd0e2d7d3005fcf400d97fc3
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
-DIST NVIDIA-FreeBSD-x86_64-304.108.tar.gz 34600935 SHA256 8044e3c9355fc243b76fac6e3a76eabb2f9df63b1d2c5711cfa3ce618677b793 SHA512 0d0465f52f997dc25a7fdb6588273368e7397bcbfe5d76895a81124d68cfcff7afa52ef29808a9795fe5ea3d563801b2fce1e26f36c1481af507743dd96f9d81 WHIRLPOOL 34be90833c016663e12b561753515841217b08f63a82ce89855ca1ea8a67c893320dc4f47f7368c3ccea69c846ec28d9411997f9bccb1adb64273a45761aab14
 DIST NVIDIA-FreeBSD-x86_64-304.116.tar.gz 34611550 SHA256 bdb6f040aa262336afffbf1e228afc60ec82fae65c10d3a20ec31e0d95d95f3a SHA512 2948ba806aafef3d05780c4b7e113f7722f037386205e23d7de20784cfa099b3067dfbdc0205023e2ad3184198971104f71f544bce7c2c5d0595f4162dde2a0e WHIRLPOOL a1b6798b5ecfaa3692db6ce57a80fcdb9ab083edafb928fb6fed5202fcabd9585fcaec9d57c3725124b1cf4eb407f14db094e9b21fe9966c0a13e57252f24464
-DIST NVIDIA-FreeBSD-x86_64-310.51.tar.gz 33574579 SHA256 9b3309488dae7097171828364b4aa4e9714afc4c5dabc0f2e95ad2fa42534d04 SHA512 0f26df1dccf5c8fbe169479ad09f6200c29ad4f1bdc3d314ac67b88186692924c193b6c34a8ce28d1ce28394909fe39e1e047c3616091fbb768cb7ca60be5669 WHIRLPOOL d08e206c376c01d0c28cb1100fc1106d44cc007985a1030fef666f440e5d6bdaf7d352cb7a8b72b9195c3acc8fe4a7adce25f876f24ceb12adfc27994413e2ea
-DIST NVIDIA-FreeBSD-x86_64-313.30.tar.gz 33557658 SHA256 192ad1bb8a0cd649e12bcccf97c5f4d2002d6695126fea81586991d9e95248d3 SHA512 79b3b47bdcbc99f724f8c424733c11f1b2653103bbe0ba9849587628611d9da08ea434c786cc7d3d891bde3dfe4068298a7377ce5b1a3484fb64ef4d28c896da WHIRLPOOL 7307d6adb04b47b8403134e7394bf9af4f90839d1fb62aa3b7b7c6d8e367392829fb249dc8d444e66158fa5b5b15cf5b6c16e1f5659a22a15c17f55eda026660
 DIST NVIDIA-FreeBSD-x86_64-319.49.tar.gz 34444632 SHA256 36b09e0c01907a7f50fe4a963ef24b2f45a6ba95a112a6f6596a1193c3741c3c SHA512 e5020aee6a38245db2c636fd5b403c3004beb40ddd88f2c139352fe5372223feb9ecd367a48e03748be2d4f200f3c772b820ab946a08bbdaace61d941c6964c8 WHIRLPOOL 585e9562ea2c6fcff110a88b6b42feda6a4c266c59e2a99adf64a0a493cb363f56be71f55e43710942297d1d39ef675599b22997a62be66be7119ecdfaa3320e
 DIST NVIDIA-FreeBSD-x86_64-319.60.tar.gz 34492071 SHA256 0b997a532629c548d49efe7fadc7266cadde3a9e2c56e63591efbaf5731d5afa SHA512 07249c8de69877b15fa0bb4334ea4c0071ec744d82d505cda41614cec964e74719a646225cbd18c9f3ba3e282285f1f830f56bd887b30bf8e398c9c460142975 WHIRLPOOL f53e15f29d5801c5de3c82174eadb77f0f4486a5de3f14903813786f2e2cb8caf2ccc7a0e585a1a20d1c785597a5a5bc7cb35cf9c70e1d9f805ff1ba6cab84cc
 DIST NVIDIA-FreeBSD-x86_64-319.76.tar.gz 34828707 SHA256 4866def3a2438555b91f9d03061a224a74dfa5b7c4615f2f5a9e018743c815b0 SHA512 a18b6d1aface4163b9567d669512a3f5ba649c62c42630be8982f7fc3c607923a21f77e5da77fecdddcbccded48bac91d7201a8ce96ac500348da60e772bb350 WHIRLPOOL 6a23f55e1ce6533a74aedc68695817c703e90f5d875f25c87e1f681e437ad72d40ab8daf47f844a2fcda28c6df4ea59b432c39b95631c2c2c6ff71c2d9e2bb1b
 DIST NVIDIA-FreeBSD-x86_64-325.15.tar.gz 34590166 SHA256 92429119ca8e50baa06c6681ed2b9eb6c37cdf256a19ba4e1827be4b202a0569 SHA512 c9e4d41a5dcb02a280fb323fd4578bc7851d4242890f1d8e69a59e083a2a76cccdaba3ed55f8eb8f983e9c89326f0a9d7152bd7770230fbe45fc7b5865c486b6 WHIRLPOOL c54638af7fb6aaf63222ea75cc377e5e449dfaa80dd47a23aed2eec8da1c460c9e3c24627a2853287585a65b0f562e3efc7916fe985a4816d82aebc12bf7021b
 DIST NVIDIA-FreeBSD-x86_64-331.20.tar.gz 46616176 SHA256 6a0396e828427fb928f18faa72288208702c3067c25c29ed3815a68a06e244c5 SHA512 29a3dfc4e4cd88c64c5ff9cd268494344ca0f56f7af79a57f1cdae8565f1199b7c577c795e986d3a8c223b640d559c8201b4c9dcab105d2ffe99035400ac2260 WHIRLPOOL 126e4320e8fb3500b09a28889af5155a75122c59f502da08f01f037adadb1cc3f08200831eb4b1da896c0a09f645ad8c40ae3ceafb93fb84f13d2fbb0bc79e6b
 DIST NVIDIA-Linux-x86-173.14.38-pkg0.run 14762614 SHA256 386ca230632f617de0ae975c037e3570469d3313a8ef488620d4af40c50e3d41 SHA512 1467a5d79bbc6a655dd3475e6a1e9281a525ae11c11207a9ffa797187ba3d040762e40380632ade02bc0125686e1dbc0cd9f5ac7fcaf4e95f5bacd0c80f7c123 WHIRLPOOL 815258bb2f0715c0330b273c224f6b42a84a59b9eb336a079e39914a4196bfceb30a0ddd3a02fea76e96ed3d74623c4204e44570d29f6f5592f4eb90f614ea90
-DIST NVIDIA-Linux-x86-304.108.run 39700058 SHA256 c965d36f896ed154f0801a3e1936fcc195f12e76cf300fc6d890c3195082c838 SHA512 a8478f098962fdd4a6db80d844930e39e020f7842407d6c5770e2aecdd8aea7fcd83c5fc527ec3b0c3688ee834d002657b40fff9deb6b4d6a67bc8c29053f714 WHIRLPOOL 8e2e4f7bdcdfaa602cffac1ec5413e137763dd0868c03d0b49322c80f6f0b82248ec8b5af2815bd4a5b504b776a5b36b69e2021ecc92d173206ee326d6450f02
 DIST NVIDIA-Linux-x86-304.116.run 39785577 SHA256 9c3a57a93b70e807a0fe54cbce146dc738defccbbebf3f5aaa927ba69305b049 SHA512 0c1bb040a054f04f29d5ce1da655dfd99f00342eeec1effece1023d77ed669983bdf7d6306a850476ed79a43c2709e80d28afa32ea2a55ec4fa8db87eea26556 WHIRLPOOL 13d1f58e29d3376b9cff3165794651ed51508830fe9059a8eca6a149cb2220fd3151d00f173d94610650f33386ddd0e0846c65fed6746e174c3954cd25b0ac9a
-DIST NVIDIA-Linux-x86-310.51.run 38891291 SHA256 f2162d903bf0873b9d4e1ad6dc464a10ee9f28b508a10525879c51ed5f47c6ca SHA512 41e14da121140be7c068703e9adbb4208cd3d9b786167523b1fc04420b7f830d89b1bcaa4a1cfa991bd59f48e1d74bb50f16493256e5fab355047985d180d26a WHIRLPOOL e548ac02b98e13aa72d9291ab668f60ba0491f9b8b91e7dda129f1e2968e105945fa41da388af189e3ceec2d699c2bc591e3dfac4759c62726a139087389f956
-DIST NVIDIA-Linux-x86-313.30.run 38845860 SHA256 0a0f10979b1bca8e4a244e204b58aeb9a580924a9dd7b11b21d15abfe1ad49ad SHA512 c3b07e7186fcf5a1f3e73f4e9510dddff2a42c0202bc471a946e38e636af27b2d17206b7105a7a80179fc17ebceab6c2802ff6ddaabae9e16a930dfa1252a2db WHIRLPOOL 2d4402883a480ae3050af18f3fe1aec4110132aa4eda0ce9675f79471a526e8b90b9ebe6a0a5c76321474be6ace963520b903cf809835472649b095be757ec52
 DIST NVIDIA-Linux-x86-319.49.run 27430192 SHA256 42b075a799acb56d0a4cfcb7210fc37b4b2c557070ef915d2f2a81c07fd2fad9 SHA512 4e8f634beddfc404dd266e11bfeb46f2991c59df4c954a9b9c58a7f319ce21a2bf65d677daf7db8fbdb86f63504e8b1430718fcbdb8754fb2ae6d03d598755e9 WHIRLPOOL 917223327993c3e0fe70d5d9df816de221ac3bda93e7fa996b20dbe7d3c0ed2827c22af31ff1335c45b46670f321fd94765011f9f4371b5cc6d78fd11fef1a0d
 DIST NVIDIA-Linux-x86-319.60.run 27756541 SHA256 d2c844e0ded02d460356022fafaa1b8a60e7c6ec751843ce8caa2cd1f86c514e SHA512 6b1927869101ed43349f1d5ebcdd3ff40929364a7cb4296d8c86fd99c3e2214d3f35d6f80235498a12ab3762bfa79be03e155ea17175cef544354d1fbe55a839 WHIRLPOOL 2fa9dce307dd818b539d36193ca87f55c2192ea230efe133374fe0a960709eb3c5e93c8b37e589b9ecfcf5a4ae5c7351d23525daf411e343b376dde849a14e6f
 DIST NVIDIA-Linux-x86-319.76.run 27823897 SHA256 d4e3de2ed1da0f4ce8230f8221954009467769cc170e43e83e352080d7f7d2cd SHA512 0e949121a7cc1978ee9af8caf7c01e7f2fdcef38101d48cf862d99ef006381ec0ea6aa5e63764b597755bedfe4e5ff3e6f02d08f2915cbce4c75e81fae812d23 WHIRLPOOL 9e5c22e3f34b6efaa43a187d4e4597d4912b02900c01142a0065af1c000160494e1053a2f1c292fa821901e5f4fad92bddc5593498f5ae24b30ed5918cd52cf0
@@ -45,10 +36,7 @@ DIST NVIDIA-Linux-x86-325.15.run 27409286 SHA256 3d790e4bfed24641f7cc76879144ab5
 DIST NVIDIA-Linux-x86-331.20.run 37034614 SHA256 7ad6b05d31e790a938474ce832488f3c68e2f388503b20f7995bdb7bb5ab9745 SHA512 e42cfdcceba7f590e0fa6d8a99bf0c80143dc5bf5af21f26ce65274426c4eb3dbd1ec6864bf4edfcfd6f463453f06f44fd67acfcdd545764741a9620381865d2 WHIRLPOOL 4045a81ea985ae95f414fa2954f281e1e0608ba0e43d35613ff667adf3e8f266886dc4de25ecdc153be8f7087bcbae8ba0d1c484473083a3c2ce9a07f5c3e515
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.38-pkg2.run 20649787 SHA256 d1c383e2c17fd176adabf6b5c0ef43004aa2be37c10edd47f65ed727a63d2c30 SHA512 9a8906b8232e11f0b839011fef312104d9d0ae15c2cb1b60217e8c31a3ce17b4f1536709d398ce3abc7740a2e586bdf30d9ce8299e2c6bb4dd4ec7cea85623d4 WHIRLPOOL 27ea0450fc9538f4fd1ea65baeda5da534b78e15cf73818fb1c974edf293259a4ab1bcfba8a4eae1c770028b30403668cce51c928c431d061b3cccbb7bb476c6
-DIST NVIDIA-Linux-x86_64-304.108.run 68052588 SHA256 56a61871f0488521f50c04607c568a177cad48a577c0f4ca625665d0015e2b39 SHA512 f8dfd38c4a9b8e127fe7ca567a46edfaca3e410bdfb82a7de0d72f78144013537638f6cad760dee06f911a04f2897410280fe560a84b55225cc7e42525159f90 WHIRLPOOL 6a0b14caea8167c328141f69fe538bd798040969c1e718c93f5fca7a077b652f6ceea96962212d432baf69e2b687ce0f2a3a7463a4549b5697e7ec4fc2bc8208
 DIST NVIDIA-Linux-x86_64-304.116.run 68213742 SHA256 3f267f2cd3f4ede4f954c5f36c8427ae4a2fa19ca8c275f892488f4dc3a4109a SHA512 8c846c5fb5f3951943140823d8d8d4672cb9a298c361b705358fac8173b96c2bd0c1f7908fcebbbef2d756f269f260ef5fb8e2f1ae5968f4f8c85e8891310e9f WHIRLPOOL d48694ad2d8bcaa22490d1c01b6b1b5f74953d13010c66127b9af0035ce9fb3070954198bcdac4ecec682157bae5aff79201d6b1e55c5e4c89be5e493c58bde3
-DIST NVIDIA-Linux-x86_64-310.51.run 68401088 SHA256 4d0f9829105a8f06121f8308fa5e67834f52b84add48eaf4101b02522db15f53 SHA512 d36406d9adbb77f80386191f623c845977fbbd86c994b60920ba97fff974efd68e4c83d8d8f2bf9323903bc49391f21c82425eef8f011549aa7b4591634232aa WHIRLPOOL c4ef120eb72b0789158e8f6f3806538523a1aff015a78eb6b089aca7baf1e9a4563e4116a22a18c22548a0708ee504f10a94b3f5504e229d69b519615ff12fb5
-DIST NVIDIA-Linux-x86_64-313.30.run 68379307 SHA256 72317f2e4c459c33c764e3283deb3e1615b1852ead1f9bfad82148e120506022 SHA512 ae4439697e47eff98e06e5f77de979bdce096f95efa8bdee9c6fc939b42b5ce3b11c23d7691e974cf0f6f783eeb0fb694670636538352a0e8979f88d687f1f86 WHIRLPOOL c12a68fcc4d78f3856d87a86cef43c3632c0db1b6c5799b6482584d4d83a7cc863b9b394a501b96534175e11663c602d72f6ffa49f85461eaf4324dc61e654ff
 DIST NVIDIA-Linux-x86_64-319.49.run 48857367 SHA256 f4bfee9f48725e20e05439ee099730fb1b42892b9ecfac000180426b044be585 SHA512 2a7c8c9f5739a37dbf819115d015462e12e9b5f80f0e37c7e99d3aea799a8601d8fa089356c68b9e0cba658d8b9f796b43727bab9366f5146e52570c05a2d58c WHIRLPOOL 2f01479de0981b3da79ea45297c6a955c8d1f6c331d7fec7d15430dbda03ff306334265adc9bb103b32df260505e519dd25b118172221d254e0fbc60cf35d5fe
 DIST NVIDIA-Linux-x86_64-319.60.run 48933020 SHA256 2bd663d0d0a9ae8769b0335ff282acfddea3cd86a3992970e445eb2f82fa1b04 SHA512 5f0f1f4c4d60b7339218ae36d9654e07b003cec5864af169ef213404496c00eea76b2db86f104f8613a76eece42a88dd8d86d7ae1ee510f2fa7b0c8034f5fae1 WHIRLPOOL a4c7c74297db8273def6fdb2f9fe706036e010d46e440c0ae0b039a94e8a3d1ed1027dd0755afef7e0103bbbdba5aa3ee1bb9cfedab4131068ec8bd86c69fe71
 DIST NVIDIA-Linux-x86_64-319.76.run 48955420 SHA256 0484acfd97d742dfc411dfde9a519839d89596f70dd63b2b4b65a9cb5bf5399e SHA512 a2ef6ab86298d8226368eae4dc0ab2a0a644b24e67e485c0192123105bce04e79ac16ed97f2df5e5e2e6affc078779c411040eba20afd31132d210ea97189f1f WHIRLPOOL f6206e120c112e7811d2ede9a8f8f7bdff1c6438a0d773bcdbea4f612490f37ba169fa573bf0569e7d0936b04ffb0ac97f8e49c02dee66e9a85cea0224ff314a
@@ -56,22 +44,19 @@ DIST NVIDIA-Linux-x86_64-325.15.run 48034648 SHA256 01446fbd94f6eb3b2e1b3d3f2b06
 DIST NVIDIA-Linux-x86_64-331.20.run 60012677 SHA256 b8803906402354d201d3b9bc21938a0fe8a7d76e93e486fddaab340df18092ec SHA512 96c2858fcfca05e68683dbc3c677194d1ad30d179cb88df445f32bc68e98b5964315336154f4a693ef1e385e809adfc3795e19b2337f4c1e93908825ee7792c1 WHIRLPOOL 66386d85ab40dd0a20a81f44e7e45b94d94bf4cebe01eb13467a6d6eed27df758d69559e069d479e888374d695290468fb15ff60159346a00e2bbe726d471866
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.38.ebuild 16603 SHA256 3e498c8e90210328b2f60513940bdce57bf35cb32a09634ee94fb1f1ea221323 SHA512 97c9a1825018e566b27acb7170ad96e73f1e1b82431e46ac844a6b9a47f14cdf86e1ab26b68ff9c272f04208c9f72b515eb8936fb0dec43d13e39fd43134a10f WHIRLPOOL 45980850b980d519b07408bade1a9225978cf5f4b7ea2dccfa120a41b7e11c62b95078b5b8164ea2b2f00fce3e330d1086d2197c6a0cd78f5deca1af8a0ae720
-EBUILD nvidia-drivers-304.108.ebuild 12656 SHA256 c216e3e43fc76ca38001d73ed606e426d805d0d66d46a9b3502970b30cc9f2f5 SHA512 84e0ea8788933f4e16fb570489d9c2b62e7384a45f4273df7574ca85915aacb4cdd461d5ee2f681fd2ad7a3016b1d7b6030f381261ce604d2863274a68396e5d WHIRLPOOL 4768505af6be1dedfb39f5ccd8fd299b087a42a5a8e6321dfe64d969ef913cee44a19f87422457ddc154277dfadfec3d0f499ed84ca6e3bcfad99bf5c52e0c35
 EBUILD nvidia-drivers-304.116.ebuild 12594 SHA256 5d561f93edf5eea440117f047cb57c33a208fc5ff6725d13de93b708182d4fa1 SHA512 c9094fd00777e3e2291ac3e3ac8944843a5c0058a8fceee9aa0cb73baf7f1f6cd5ffd3975f0feaf50ac193d856da12291a4b4c26043e5d89f6cac504f0626b30 WHIRLPOOL 4ae04b88731d095c6474d6c018482be8c8f28c7d1fe8a2da6825e6ee897c960b4a9c3843a5b720177ecfdd82e0b338cc018e2e82f593987d78031e1f33be6fa3
-EBUILD nvidia-drivers-310.51.ebuild 12249 SHA256 d56acf1e2bd31429e44a578c8c363d3bcf73e3f2e4210565f79051375020379d SHA512 52bba0edcc6bb6826a3103abaa41fcf768a7e7aa4ff77c64e19387f612556992d6ad795987b46ad4f57a6cb190f3e0215cc63ec74b086d3e4fbb3fcea835ccf9 WHIRLPOOL 271567826fa2967d2e84221f63631d9abd45e9d51b9a09d515030736eb43042956cac39d6b31b41f9e135b999a82daa39ac85b51515426d85d8efb68fc45f133
-EBUILD nvidia-drivers-313.30.ebuild 12180 SHA256 8e6cf970020f3afdee1a6c1731f366c1c57d1ba745a436bf03ec0be29aaba7f2 SHA512 58026082723ea1bab304f18d26b0dddab42f9bf2ab0e758bea2385d033c7089bc66b18075257e6a61c965953a95d1ef3e8019811a8b7a8913edd4affb319e755 WHIRLPOOL 82f232ab8b1efab82c0ccbce15581c4423fc2e6b8f61ae1dab206d020c113e1183914139c3ba355306edd8a3937b8351084a23b9646ecdaea2fcb90195abe596
 EBUILD nvidia-drivers-319.49.ebuild 12267 SHA256 7d1bdd11bd4c71f5bb7d5c531d4c5a176863274943187f6cbb4afd7cd75dc199 SHA512 177e642286acc0895d484c1dcc57b935520d479cd34072a68e589b173b9610c2d1eeccacc9993547df85eea9bd7ff9fec74850484cdedbd5bd4af7fe25fca038 WHIRLPOOL 3c4606785a02424d7f286084ec191f3e2f86567b7057e93a011f0a5022564764efb420a0fb31c3ecae584b94e9fac28477e23a1d6f2822bf62d750d17fc0cf65
 EBUILD nvidia-drivers-319.60.ebuild 12267 SHA256 8b0a1670d952569fd0b04715cc6ba9e35b462a33868205bf99f8b707615072ac SHA512 2251827eab81486c19c6e75c0244d92e4309a0bbeab7e559ae2a41ed250587e54f677811ddac7780709bfdad44efaa175c0694395ad2bc910293281955cff7e3 WHIRLPOOL 99b3099e2846657089611297d4044d515b7d772415abb6a22e258f2756e812a9b68a426b2c5aac7a0d0ea6511f549bf85055fc73e90e770e0180c6666ba8421b
-EBUILD nvidia-drivers-319.76.ebuild 12269 SHA256 7770410b4e61dc6d939e97bf7076328cbeeae95fe1b753019299afb07acaa1ea SHA512 502ffbc26a784095588ecae45787753c284cbeecd1cfc8adeb8c408a0be4c365f763fc60cdd40d0f7f99a71a3a1f987264c01aa0028396d9ae9f4a55cff1ae3a WHIRLPOOL 80e7e5e720b7911614feb8c534c7fa4106d8283a193cff482c5e9e5c9897cdf3363c1c0649009d30dbad17ad627f503f2ec422a2a35d5928af04eec0f238f81e
+EBUILD nvidia-drivers-319.76.ebuild 12267 SHA256 126766df5936ba0b3a241cca3225f0b61e034639a25fa9a3a8e51127cc257924 SHA512 2d5ba57ab91b44eb1bc06914e1cefbff21ce42ddee898ee923b79778bf7d1014babc545291f8758295f1fda4f86fb63c7f2e6ec4089467b34cc7f8e3adf71748 WHIRLPOOL c39bf2fe22000c0195f504ed1a3fcc61c40a244df3549ffdb2d591559cb76bb5005725c5d5a40db18150324644b42a1beb1dd08d481b1faf68e1dec621bcc1eb
 EBUILD nvidia-drivers-325.15.ebuild 12275 SHA256 f7ca6aca38026771e25fa20a7f5197aa31898a3c5281f9c3d9d1c12720a470c0 SHA512 f6e2e6c94e8c07e4a33bad1dbd55985672ed2e3608b6245a994d1074db45e74d455d9cff846499b5088829a21055151c9a62628585da4cf8ef6d9b30229bacf3 WHIRLPOOL 0d2b906a39739d27eddda1589808e01ed69874600dab1e3cfcfddf2b6625d6638df32a8fb736262a77b2d97a18d8acedddbdbd64bf5746ee548300306833db96
 EBUILD nvidia-drivers-331.20.ebuild 12286 SHA256 3e88f3781ff6130ffd81f5fc3ce03a9d4d218a63365eb65a558ce37eefe503df SHA512 0e654a25299042f6a45241c88b7fd844dafb3805d04424990adfcb52a12af40feee3ed22c2790d7ecf7d569a7c1483aebc1acb028762664b0dd289602571d9d5 WHIRLPOOL 61a37e15a846732e89581a2b9cd9d3dbf26331c0e5f317f0ce3becd5295e79795c1ff1006e59ef3d9adf1519655b7abb4732548dc9a76f413e6e59db1acae64b
 EBUILD nvidia-drivers-96.43.23.ebuild 14936 SHA256 0a9336063f03c24abfcd331556c5692929a10a87235ebe77e5cae9c92c159290 SHA512 5f8e8cc7c421623e2e09a808cf8dbf56ac7167b05956e5f9c05e0aa3a542fe465c1b38609a7891a454abc30d7db8ccb1e2326e3e025269139d98ff9b7b31d821 WHIRLPOOL 9513e16d95407877741b9a820c9cafd2ec32d5caa3cb2ead2bd3661abef6a45cbe1e2b6db155b4e1b88fc7dc392c8548306c680233213c1b3b98065660057a08
-MISC ChangeLog 101349 SHA256 41a32b55f8dc77b85d3668f8b56180f53853e36b81fc4cd8e5c521864c51629d SHA512 e1a0f16e791e62d87c7f42307128381b883fbf4b0cddeace3cd689d83d5f86bc7ad7bb7b496cd0487f44612a7e22489214e46fac8979bafd41da074e77b519ca WHIRLPOOL 4b2b3bc04ffef2265e5356f18a373a627c33e9dd9642ca1798630b5fd2563e60f5b1bf843adaba1c2230520a2f06c8aa5d745f73533abd1334461025a0bea14b
+MISC ChangeLog 101553 SHA256 76a1c327ac350e2a5517d17c2aad4f811a8ab606c9fe8e910f1ee4ed0ce94b2f SHA512 a798c28ed8d0c8f8029890897af90e38ec3d859eac07e6e23d9dd447b2f8564deb10f78f3db7c07e566b4661757efe2c75f24b0513aa430c68dd85ff3c61c81a WHIRLPOOL d8409b0ca2e0748b24ba1b26f53ecf8a9f76dcddc9dfea296ee3a3168db1e8403dd08cfb69b9f924e057e6e942c0ccf83452ae8f3a2440dae3cdfb592b51d70d
 MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlKdvdkACgkQVWmRsqeSphMegACfXJe9/nqRqfj2gKkIzZCC7a84
-tGUAl3dka6FIYt0HDpaS8zptzFjshp4=
-=lMXy
+iEYEAREIAAYFAlKh8vEACgkQVWmRsqeSphM9WQCfSDxHIMvPxPLwTdSMraIyXUc9
+FREAnRsGKEz8mSoTcgLRq3NCzzaXdaC8
+=LK83
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild
deleted file mode 100644
index 217ceb72e474..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.108.ebuild
+++ /dev/null
@@ -1,460 +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-304.108.ebuild,v 1.4 2013/10/12 15:14:41 jer Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator udev
-
-NV_URI="ftp://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}
-	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-base/xorg-server-1.14.99
-		x11-libs/libXvMC
-		multilib? (
-			|| (
-				(
-					x11-libs/libX11[abi_x86_32]
-					x11-libs/libXext[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-	)
-"
-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 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
-
-	# 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
-
-	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 ${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} ${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
-
-	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, 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
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-310.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-310.51.ebuild
deleted file mode 100644
index 7f8583d89772..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-310.51.ebuild
+++ /dev/null
@@ -1,447 +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-310.51.ebuild,v 1.7 2013/10/12 15:14:41 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}
-	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]
-		|| ( x11-libs/pangox-compat <x11-libs/pango-1.31[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 10 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.10"
-		ewarn "<sys-kernel/vanilla-sources-3.10"
-		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
-		[ -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}
-
-	# 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 || die "failed to install 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-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 ${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-313.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild
deleted file mode 100644
index 76466dd43acd..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild
+++ /dev/null
@@ -1,446 +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-313.30.ebuild,v 1.8 2013/10/12 15:14:41 jer Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="ftp://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}
-	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-libs/libvdpau-0.3-r1
-		<x11-base/xorg-server-1.14.99
-		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 9 ; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-3.9"
-		ewarn "<sys-kernel/vanilla-sources-3.9"
-		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
-		[ -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}
-
-	# 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 || die "failed to install 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-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 ${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-319.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
index 0d4cf113e246..971191ca7499 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2013/12/03 11:17:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-319.76.ebuild,v 1.2 2013/12/06 15:53:20 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"