drop splitted x11 drivers, we go gentoo way

42 files changed, 0 insertions, 4664 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
deleted file mode 100644
index 139cebdf..00000000
--- a/x11-drivers/nvidia-drivers/Manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
-DIST NVIDIA-FreeBSD-x86-304.125.tar.gz 34494889 SHA256 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269 SHA512 d2760196d3f0dfb1837d496bd11dbedab6a2bf3de98da35f16c92133452b915b425a718f72e560f5d6483caf5e2e5bcf99a462b2e392d7a08c77b59695649108 WHIRLPOOL eb008e1956043d48af5f928dc594c8ae9c8a946834d889db5b4a9b3f16bfaeb311221e5d3f83c8c599dee860b54a42030dccf2aaec31dffb6e8460bf646b82ad
-DIST NVIDIA-FreeBSD-x86-331.67.tar.gz 55876749 SHA256 0c88c363db516ef09b0027aacb1e686191d3d4676f44445bab2156c2197a6cae SHA512 0394aefbcd99a40e5cfc03a169bbf4bd8d34828cf2656ea49c560312e1cb7f575eeb32cd8dfe6f22a259e04efcf5183149846dee18b6ee254987f333fba82cba WHIRLPOOL 8b179600db7e8d1be476761ab0d5e6b5d10167e936044bf5de89115012bcdc0ecdd1ee7ed6da969261fe95f8b05c4b97a41343ed0ae2d283ff777d58971fbd7e
-DIST NVIDIA-FreeBSD-x86-337.25.tar.gz 58137349 SHA256 9857b24b5d910fb8688a2b9e11039d88b70ec250e900149183454675a363e8db SHA512 0c85814061732bd09948b5fd203d5d3a1fd5df0e1c23f4af11e1cfae6f7d8c7d7f569f35398c2c5551abf7eb5ce357229fa9b16ce2c21799e96396cff3313777 WHIRLPOOL a7ca516e184334117e1cdd45b3f4c1b0a8c50281ffd1c3859865d877c2bfb20136c308b1ff09e4d64d0e7fef8eeddacab488d0bc30c98d82a9280572be5f0de0
-DIST NVIDIA-FreeBSD-x86-340.32.tar.gz 59021194 SHA256 ee4f34a279ae84b97373adbc8c91ab7d34eb52dd4a7b095d51d8592b3e264df8 SHA512 9b5eafa48ccb105fe978242096c99355a291314cacf7a232cb81292355dffac5496cdb8667fa4ad3f0f2286792bf0473f523535e3258bb3b0237c76dbf5ba837 WHIRLPOOL b9438f675f65ec0b55aa2c1ca8c3beb35d20f3c56837bbeb02d511b66d4bce825ba95852ecbca70f6f83ff53f23c98e1c0d2bd313d195426fea63baed27c1cce
-DIST NVIDIA-FreeBSD-x86-340.46.tar.gz 59013852 SHA256 5aa4ec5f9ca4425cd3fdc47ac19c76900cecae8a9606632a8063514481363571 SHA512 03bddeb919c6ff58e11df2a4d7f0c30a8f47a9970704dde762c81183773057cdffadf37d60bb920c218b1c72bc8f71949aadcf250747f48b1cd27b1a6164949b WHIRLPOOL 0ce3f23d4660e368b10972a39366a1d26116e38fddaee1a3a4764e85e868151bc7f1e27f3c1dbbc52187c74acabd483c65455d7fd0b9679d89a2c05200e05d83
-DIST NVIDIA-FreeBSD-x86-340.58.tar.gz 59074607 SHA256 be4fdf4502532c39483a1072ed89bd33e0e49717a2523f412fe3c75da5edbc6c SHA512 c02d160ffc6a027a26c5fe2e6d7eff833f1e2cdb2c2006baad571bb733ddee68a8675175bddb1e154bea69571af633b125a524ca7b8ffd535b88ac91579f7bfb WHIRLPOOL 0999d380ae8770e1240287de002dc133d816c0895d39110fdc3f7455a7d25effbce09cbfea1b09b8b01b2214cd1f33554ba202a5f816c80b9884edb03ce2d9d6
-DIST NVIDIA-FreeBSD-x86-340.76.tar.gz 59362290 SHA256 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f SHA512 e6d8b6d03fe0f9ab25ddeef680e0159ea4073d03762d3419761c02b917edefa9a1f81c209bd386838141c1924364c81126b0a356c325b056a0c2451865bed5eb WHIRLPOOL 7ec0cef6f92bfbd4c8b6a051dc8de4b6b138f63fd4f7e18756178a9aebb91ea32523d5ca885481d8c8c3d1531b153699f4e5606c155d6c3aa79a340637d3744b
-DIST NVIDIA-FreeBSD-x86-343.36.tar.gz 59205879 SHA256 8634e7537eca778790296f8355e39ae9a7e16642648e671a6c9339ee55fe340c SHA512 35fcf57d5e830cbe3c07ec70362ad9f0ff6ec327c6b11b6d3c533315e59031501501b9fdb80a3bef720506e5221ad84496745ce13d2c9885076f1c8e8537ba46 WHIRLPOOL 3ed3230dc190e7670c960743d94b8db1c0d9908b597f952746d851b403847e7b2836f1c60e6af0fe73072c1fda3971dfacc37c21908c227b2c20b5045dbfd61f
-DIST NVIDIA-FreeBSD-x86-346.35.tar.gz 57980205 SHA256 c2decd38b2ff3e46a611acfd2ca41fd887b7223f6aee1f57f52717b4206e2be3 SHA512 acf8a7792a9a0bd388139548d5923a2daa59680e44877083e8de2935f8eed83821505b036bd18ea282e9c4996d069675f8406d0958b49a0efa9c0fd64e69c3d1 WHIRLPOOL 1ed58654eee9b6e38275c60a6197faff095082ff176e548522c03cf2e5f91f2b632d49341eed8f537422343a43577419239327266243402b0425b6a46ee21f83
-DIST NVIDIA-FreeBSD-x86-346.59.tar.gz 57992895 SHA256 6cb7ad1b38f4f01fea898f335452e95ebe350285c9dfe1bf83c73f450231c9ae SHA512 2e421047dc850c6d3071df17f1507ce4f925ba05adca8efd01e3b6c2451cc45231e077aa4df29b398b99a44ff054b84555803b4d9bf6c11fb681706d3b5c1e50 WHIRLPOOL 88c965f850d6c9daaa27d95124ca456f0484581c1901026fe1becf2c6932cd2ee4e8bffaeca7c0239971f7418bee4565af96ba7e2eebd3b6e60dcc244df20abb
-DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
-DIST NVIDIA-FreeBSD-x86_64-331.67.tar.gz 46997728 SHA256 5781bba8b7783f96c1f239961140317426910633fbfa3ba80fdcefe54aec7e92 SHA512 1653c03e091451f14c040c2b56de8574e5fd5d7b24db6ce979f99693f6a10e61e6c28fb3a962288a135551664973bba6d2f29b92aff726a4ee592fddc807db4e WHIRLPOOL a97d473c786451c7cb88155edb12a86da5f2888a584da7538dae93056357d0c63f294d638f6949c7a6f8255c60c3db84fdbb28ce10cd6da4c82758f95eb90679
-DIST NVIDIA-FreeBSD-x86_64-337.25.tar.gz 58941876 SHA256 189dc0f70528d0099d0396a52bf759af74d6a99203484be2d2d6514faf0d4161 SHA512 458c9200579a6caed02aabbc196ec998a0d19149cca665c5ef9bc709c018b991b27713c92d00bdd1ea6ddd86e04c641f387e1ec8a1235cc9581af9e7a3b19ebf WHIRLPOOL d819cf486edc443b1da39ea67582a12698b1dea1501f3b6738014a80f8a96260aa0ba30a9e2f1fac075f0f7d604dc94978f7f82092b40531dd4989a2954cc420
-DIST NVIDIA-FreeBSD-x86_64-340.32.tar.gz 59836909 SHA256 4a55cbd4f87528d4d5b5a8809a8c6e2dac9ad22b0f8b357590893dfb39e52512 SHA512 ef333d94a147e04292d6e197ee72a7abfb10a84665931876455b689409af42ac713d1a16f965214a46d9dd28fd324769fa4dd14dde5caf20a8b23a9683b6c55e WHIRLPOOL 76fd78eb97b69d7a5d7dc46e06a8d7b4dc3fadc1f2c6995d86161ca90ce99ec4a0b42eedf09939a4436481bad33ef201f49c73c8add833cf912af86774d47b34
-DIST NVIDIA-FreeBSD-x86_64-340.46.tar.gz 59835566 SHA256 699a65b5184f8705ba4ddbefb5776136bec98619ea00af3304725e5e028b7346 SHA512 7a6ba9fbd769aec45985664edd7291403e70c0e89a90f5c0665d6433e4baa8e0b59ceb99e817b377753576d189c0091d5af0bc2da796726ce0a9f0ebfa831d5b WHIRLPOOL aea421916646f68efbba007c08319d7b26259e1ee146bd420910468c36c04c3bc574ee6db103d64259083b11190cb3d5342a3dd1af42b0a306aa4515eb4bc9af
-DIST NVIDIA-FreeBSD-x86_64-340.58.tar.gz 59892350 SHA256 c59e4c4e1c95a53d1dd797b99c852272fad0a256be65599eef82a6a2a16ce502 SHA512 bad7975662045e8e8075a558e3805b65e69536c9c8896a31245ff9e28b44c723ec7b3e9c9b40fa92622c0f5a966ea89bcf247156ee34e4977e933eab4595f22d WHIRLPOOL 893744d9f532ab463e7ba7d99999714816ad8eaed18a9e72ef47b3d9da4d493da4f4f2b6bf415dc20dec70d3ec850dfa26c8fae69a5166b093c8de36797b94e2
-DIST NVIDIA-FreeBSD-x86_64-340.76.tar.gz 60206978 SHA256 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0 SHA512 d478eac282dfb43205f7464d6542cf1f71ed4dea6b8381314affb8647d104c5ddf7e658b6b8eb5e0bdb18207b92f76c574b24959ce23034d375cc712998e6e7c WHIRLPOOL 98ebffd792a47e3a9ef369976db11909bc13551f38977f85ece41e5a31a790c2c173badfc166e3a0bfe4361d5221129d19364c074ba11fc4aa9062d5cb1499a8
-DIST NVIDIA-FreeBSD-x86_64-343.36.tar.gz 60045074 SHA256 aa189d9fd6448ed49ff4a8dd09dd15c06f6b3ef662fd3d960b4853c485cbab8a SHA512 23c38de071ac6e2c87db2c767b07f243703e55cd6485eb8e538fb72f38e9856b7ff28430fdd7eccc4728f3d36c14eac8b1fbf7155fe864ead93ed4218d5b65b5 WHIRLPOOL 401cdc5675d5fe60b6ca492be912573e9fc56a0a67ad680e2cada783ec8a34c15c6ca1a495c8fdbf09e384bc420295750540f5c77907c459c80f400d8291e44a
-DIST NVIDIA-FreeBSD-x86_64-346.35.tar.gz 58753495 SHA256 0a1c92efb9e29d0d4e1c099a5f2c69a29ac2431dbc33009cc83a35c794c48d33 SHA512 8838602a1e739043158b29ada81fceb36bb68385b5bdc21cc675eb8daafff45acb75efe9c8c00a45ce74164f510198490e820dcd0a797e52ff41254d93e467d3 WHIRLPOOL 7ecd9a92d3a7fe415faf3c7b9bda9af288aa65880fcbc0ec5131d85f1099dde569497e93e6060d8c96c426145d30e2bcd8d74e53d951591726888137fc3f5873
-DIST NVIDIA-FreeBSD-x86_64-346.59.tar.gz 58735813 SHA256 074840aeacb8965f14bc312db432efa320f97380bb8b21bb9cf1b242384d6651 SHA512 23c74f4ee9268b0583cee06b4e2109d33547a0e8789a67d7450b056f657d745930b834a5831a8709b9a095bcc63dbc76cbee219240519490ece1e40e2bf413eb WHIRLPOOL 985fe2fc59b38f3babaf534d7d04924b1d43ce3bc42b71420ea426f99ecbaed98aed5224bb5d30fbcc2b44978f38d8e812767a2bb7ee41c1d551c32bb345dc8d
-DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
-DIST NVIDIA-Linux-x86-304.125.run 40589395 SHA256 aec5b3a792910e152d5af756ef6fd7224c448c564564c7c448ab8ec3fc78c4f7 SHA512 cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7 WHIRLPOOL 85cd375e1b67bbabe9a8119affec20b7a9a258f8b5be89d755f7ea596a94f98df053e8ade33f1aba1f74f753dcb636268c4f2074a09eaf68d858241f1482552c
-DIST NVIDIA-Linux-x86-331.67.run 37064511 SHA256 696b4a574ad3cb2b3286e0848e7e831940110cc33c63de51890154dbbd31acc6 SHA512 2a17854b366aa67a398c8d66134fb78d0ccdf4a6b2fe874bb7c146cfd24501431ed7448f5b7e24c8f78c6b1f6c2d5da207fbf568c2135ef53e51e83ce02cc374 WHIRLPOOL 4ad64717eb43043bacfbecdd6efe38bc5bf598acf172984e7c3eb1dcd779a9cbe53a76ac6e7b94b1d950d1f279147ceee4037d89be589fef2219d826eb86d09e
-DIST NVIDIA-Linux-x86-337.25.run 37649836 SHA256 f76ece6bd98bfe2ae641a1847094e98c6f7ad7a01af682b4f38108d6b6227f9b SHA512 f68105a43f9129f4112c8a091ed7c9641708b62d20c199544e5e7079d5c5bdc0b6c83427be868e62c7134400ca62cab6a65eaff96ddb940768750250cbd50112 WHIRLPOOL 1ff92ffe33dad59bf393a7b6fe7523362433704dc8329701e74814c2eef833d15e44334264601080b90f723f5390ce6502fa3ed530fe9fadaf3efff139e65047
-DIST NVIDIA-Linux-x86-340.32.run 38587515 SHA256 1d0489c35c5b332c9b949d9de3c3cbab4ac3a94385aa41e7a7b62ef23f4395f5 SHA512 a67e57a1bd70a9cd5ae2bed70403920ed94d8eac9d08dcd380f6065cd597d5824e26ae25a0bcd56626190124c07d128f3b0429040794c8e8d3ead85860fcb646 WHIRLPOOL 66bf6db27edddae845606e82cf9397dbf483bbde23e97899575c8ac3f6ce86c84d88f8e60c60b1aad1360fe9bea4f43de030a849f88f43d482508de23cd24d8e
-DIST NVIDIA-Linux-x86-340.46.run 38635506 SHA256 a2e6d779397372dea77466e85ba30a15211c24502687512694604e570db11f87 SHA512 3d90a73fbe07eb25ec80a485c3827bebaf64a941331d6f28fb9b925678d74d66421dfecf6fe9637fb57b4aece268e987bfa8f29c06567243ae998d7ddac25f98 WHIRLPOOL dca92cff7d72f105e89deea74d6de69d4f78f1a7b15adea9e4a8cbbca9007b4bee4cc9b9f0cb39d7a2436e141785a5cfd3011b235418e701d27e7393ffefbf66
-DIST NVIDIA-Linux-x86-340.58.run 38527667 SHA256 7cc48ff0681667aad8213a4dd3cf7695cad29a5a23a3110d22566c362c76fb5b SHA512 71381af39622feaaa84e005212f2bfa0800d2b100cac8aafdaeaa3ae1cb5aff47e1d2927bbed059ec1667a41c65946fee4ee763c9cfc5d78b68c06bac55757e7 WHIRLPOOL 31230ddaf971fe35086c1c42530bf066d8632d1d2082329b42c076afacfcab4f0edeae87b27a9a59ee9915f8451ad9d4305a32ff87af459a4e87bedac181241b
-DIST NVIDIA-Linux-x86-340.76.run 38818911 SHA256 9b29d93b49009caed84a8852825c3e7c6ebbbba8ec99b03ee5113108c8b036d0 SHA512 45d7b29670f9ca50de80d6d61260015b45f74422bbd12039923d04ae8b033b903b27e9f4c174461055f3cf45a4af44565ce9a8b9cd671e0e54d37770a1156839 WHIRLPOOL da7e072a56e3aff8b4688e60c5acd76c97804fa582d21c70dce043b13fa2317d1021f19927e827cf6132aebe2d40371c750e3eb56697bc7eda16bb7369bf2994
-DIST NVIDIA-Linux-x86-343.36.run 41073259 SHA256 8cc1c99fbda29b3258f57dbdacef11921aca2e3ac106ef591f0815716e1b829e SHA512 a6287cf8ad6379daa7c6d7ae6bc08f9985ad9e9353de6d88eb72d8a1acad3e25eb65076b904152c6ddd8ac54b9afcdbb7a5dfb9a46e75c5654be87b3df0e48e1 WHIRLPOOL 7aaa7977a850314045bcfcc36a8f6ed8b3f487ec972e109ea48cbe3edda4ff29c0bf02e7c11dacf6a3e71783259dc809840c32e301aa16f2d4394d7f07cffc0a
-DIST NVIDIA-Linux-x86-346.35.run 40692611 SHA256 bba63c30c730ad7b8500a77c81cae58562b9f9b57cd576b61f37a2d8bc45df25 SHA512 df9213fe4743b6c329c1789dbdfe962af9c647a4e20380f957bc55369554fc731ffc098c00de922529d372b9686a170f6ccb1ce2e573ae57402396db9a3dc73d WHIRLPOOL 111b5a52fba139171163c6c31faade9d4ff40940520a10477cf90c998b2254c74fa571d7697b82ac515b80b71a3e205d1968b06c60ab057d008a41c45406e68e
-DIST NVIDIA-Linux-x86-346.59.run 41370855 SHA256 65cf83fccc02399d54212cbeea1c2364e4974687c3ad6cba87cc109476ad2129 SHA512 f7fd76cd4c73528c9476494e1a35b27dedbbbdc4a190ae5909c27b8e1b0c3ef5c446ef40c199b245eaf39621eda55ef8d4f4adbe8d2d75b8d5f1ba14f703c56c WHIRLPOOL 2895275d549084c596396f6dd7a25f040a4af52c70090ed393f3eb409edb2cbfc17c622d0fd200b44e1ba3e4d4e3f2f6ea11a8c379e81e8c2bc514eb8e0fafcf
-DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
-DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
-DIST NVIDIA-Linux-x86_64-331.67.run 60231750 SHA256 9c7f2bb44bb26a5effb915d8aa22132a6c06483e0cfa6f47b7265b15da83bbd7 SHA512 7368a60c282386bc5b68599cacd07a18a9be4c3fd624eac9eb92966221318723c3f44ae033163789eae1ae683e729d49268769e79c465aca6632c5a7e6d6942a WHIRLPOOL 552f590257e3e1e53b83563aeea840a78869c10ea2707cea779da99ec726cc17398fada84379537ac2e6a7dc8a653c8b00141ab35adb10a5a49d0da565c2eb73
-DIST NVIDIA-Linux-x86_64-337.25.run 68053486 SHA256 83280f7738f65bb2e790e7530a38978cf0bd0aa741eda51629c9e9b068128af0 SHA512 27cb5030da00d6fa2a2dd6701cc149ce885e7ff7e7ca4f1629c27737357fdadedec41e830f5cacabef14646515d6d2729f753d78424260316e28111f2c3e53b9 WHIRLPOOL 72eba5239ae7272d3501403ef292f0e131896b3dd852a7e2423e79206d99aa5a4a3b98eb4193ad5cd1e0247ffd48189d3a3ba02ca307a759a4f15b9c9a386dbd
-DIST NVIDIA-Linux-x86_64-340.32.run 69753673 SHA256 ef96003110564953cad4ffaec073696dcf9652338dfe5eb0c58ae3ce45db42ac SHA512 24c2dec161022bd229862ad66711232cf6424a0bd1eb056d7eb22a34e265d4b1f6208779cf507b480189f95f795d580a30ec5f8ab1bff549d2a41a57adcc14b4 WHIRLPOOL 6422498998253003fc1e1d6396449d2fe35b5836a083a254d9d7439434e5a3e1cf55afbcc3860a234ee9b3d0a1b18b9c58e4946107465559f0dcb121ef796e5a
-DIST NVIDIA-Linux-x86_64-340.46.run 69693129 SHA256 57e7694b5a985ee95d2da37598ec37cdabf40f914490f4cdb0c5184f12a74270 SHA512 43cce2911c1894fe9240453179666c5fd1f437b49a1e3e5990463e9009ffa25d5da7f91105d1520c6133a0bdef9070c768efdc087e2d8ef85ed7896fcf555c7a WHIRLPOOL 9f845c5b6621fcc34a5b64d1c5823a3978a04c669ee4d3f7e3aee3f8da06c1c6eaa3b51792be2e1006945ee06df0c1a2650fc70d4257b768ca4d144a79775892
-DIST NVIDIA-Linux-x86_64-340.58.run 69851185 SHA256 70cc452161b969d659225a3a7d4cc17d5827f8f8ce6eb053757f30f6a666a643 SHA512 c88a83d7a5493b8069d2cac24363c7ca2e87ea9ca617cf9ffb0277c52dc39624019479b61e218f7d7a033c58b685131582e38a02e5a529c96126225f5b8cf8db WHIRLPOOL 9bc7f8c6c4a4be0b7b1f10a3de02ad0a3c1039522df5e3703ba180988ad4cab007801b1858c274f41edc87d7851db6eb54f2f4599cc91ae9e2cf11b5ac0d8fb4
-DIST NVIDIA-Linux-x86_64-340.76.run 69955037 SHA256 3bf670e9a2bdb184648dec54ce06fab65e798a9a4c9dd5155e2be4efee3e0994 SHA512 59ad49a49f170ec971e2b5ee3a45b9f972521bc4b7ab6f02f46a5cfc5b1998841195cc5c91dffc417d2183de39c5a589eabf7b48864e0c6842363a75051db40c WHIRLPOOL 8c846f2b5b6f56bd2962fe4660751a4485e0ddd2186bde0affccece32271b03f4f3c226377c0b1877ea391ab130ed6f282c316f227205488a63e4f0a19db82cc
-DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a09403630a674c32e514bdcfb54cec3c81810fc78 SHA512 6e76e54b24b0c1fa16e94eaf0f99d2e7dfd28e5aaae0bcb6df3e6d4e20c7a13d5d30902e2bc9bc7609c8d87e5ec8fbf16a5a2dd513bb9d761714176c4ce5e283 WHIRLPOOL 73040a3f3073486c5d6d0a5d84be7d478a3c15bb4aee21f3c590592afe2845f8e9c7064010ddc8f93b764e48940e523952abf9978d09cd32ec1ce8b644e59eb6
-DIST NVIDIA-Linux-x86_64-346.35.run 73462796 SHA256 8625acbbc7a2abdda436a5cb9d06f2a7f5913b16e0a35ac4f9f106853a94d086 SHA512 dab2ce5a722a93e83822cb83db6d3ef612274a6e3236b0ff34f081630cc00f76be5a0a1637b85dda2ca289336e44b6586afc82a228cb5de8ca1105d6bd4f4750 WHIRLPOOL f5255f714ff9f14edb26246826c810de05de1d6bcaeaf30f52294313aa1f68fbd432ddbddf576757cee711e19e4b7d2f14fb30f8975c9e2686395fb31998f413
-DIST NVIDIA-Linux-x86_64-346.59.run 73468725 SHA256 231020548431569c0172605815ba131a18f969966b4abf82129f974740bc64ca SHA512 a8d2cfcf750c4f0f155450a50132e1c2a6736212d654ab5539f1dd17233ed6f9ed64777f73f2b394e236d27abee4f4c7a344855372a641552ea40a8973fddfe9 WHIRLPOOL 0e919b147c9088106a8a3bf138262998a02b0da71c8e656d6b888f952e19b11ad8a0b6b4eee6e7181a8421aa2f0b4be86b82c0a14282e56e135f80e1c00aa659
diff --git a/x11-drivers/nvidia-drivers/files/10nvidia b/x11-drivers/nvidia-drivers/files/10nvidia
deleted file mode 100644
index f1bc2fef..00000000
--- a/x11-drivers/nvidia-drivers/files/10nvidia
+++ /dev/null
@@ -1 +0,0 @@
-__GL_NO_DSO_FINALIZER="1"
diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
deleted file mode 100644
index da92b8f0..00000000
--- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh
---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh	2010-05-19 05:38:57.000000000 +0200
-+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh	2010-05-22 02:13:56.000000000 +0200
-@@ -101,7 +101,7 @@ build_cflags() {
- 
-     if [ "$OUTPUT" != "$SOURCES" ]; then
-         MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -110,7 +110,7 @@ build_cflags() {
-         fi
-     else
-         MACH_CFLAGS="-I$HEADERS/asm/mach-default"
--        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
-             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
-         fi
-@@ -121,7 +121,7 @@ build_cflags() {
- 
-     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
- 
--    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-+    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
diff --git a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
deleted file mode 100644
index 75b39cfb..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	# libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully
-	if [ -e $2.$3 ] ; then
-		doexe $2.$3
-		dosym ${libname}.$3 $1/${libname}
-		[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
deleted file mode 100644
index b14df34b..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
deleted file mode 100644
index e48d11ce..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distribnuted under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-#
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	if [[ ${#} -eq 2 ]] ; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-		pkglibdir=lib32
-	fi
-
-	local usrpkglibdir=usr/${pkglibdir}
-	local libdir=usr/X11R6/${pkglibdir}
-	local drvdir=${libdir}/modules/drivers
-	local extdir=${libdir}/modules/extensions
-	local incdir=usr/include/GL
-	local sover=${PV}
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
-	local TLS_ROOT="${NV_ROOT}/tls"
-	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
-
-	if use x86-fbsd; then
-		# on FreeBSD everything is on obj/
-		pkglibdir=obj
-		usrpkglibdir=obj
-		x11pkglibdir=obj
-		drvdir=obj
-		extdir=obj
-
-		# don't ask me why the headers are there.. glxext.h is missing
-		incdir=doc
-
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
-
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover}
-
-	dodir ${NO_TLS_ROOT}
-	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
-
-	if ! use x86-fbsd; then
-		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	if want_tls ; then
-		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	else
-		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	fi
-
-	if ! use x86-fbsd; then
-		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
-		local ver1=$(get_version_component_range 1)
-		local ver2=$(get_version_component_range 2)
-		local ver3=$(get_version_component_range 3)
-		sed -e "s:\${PV}:${PV}:"     \
-			-e "s:\${ver1}:${ver1}:" \
-			-e "s:\${ver2}:${ver2}:" \
-			-e "s:\${ver3}:${ver3}:" \
-			-e "s:\${libdir}:${inslibdir}:" \
-			"${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-
-	[[ -f ${drvdir}/nvidia_drv.so ]] && \
-		doexe ${drvdir}/nvidia_drv.so
-
-	insinto /usr/${inslibdir}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto /usr/${inslibdir}
-	# fix Bug 131315
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-		dosym libXvMCNVIDIA.so.${PV} \
-			/usr/${inslibdir}/libXvMCNVIDIA.so
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
-		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-
-	#cuda
-	if [[ -f usr/include/cuda/cuda.h ]]; then
-		dodir /usr/include/cuda
-		insinto /usr/include/cuda
-		doins usr/include/cuda/*.h
-
-		if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then
-			dolib.so usr/${pkglibdir}/libcuda.so.${PV}
-			dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1
-			dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
-		fi
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
deleted file mode 100644
index 4debb85d..00000000
--- a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $
-
-want_tls() {
-	# For uclibc or anything non glibc, return false
-	has_version sys-libs/glibc || return 1
-
-	# Old versions of glibc were lt/no-tls only
-	has_version '<sys-libs/glibc-2.3.2' && return 1
-
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) return 1 ;;
-		esac
-	fi
-
-	# If we've got nptl, we've got tls
-	built_with_use --missing true sys-libs/glibc nptl && return 0
-
-	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
-	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
-		case ${CHOST/-*} in
-			i486|i586) return 1 ;;
-		esac
-	fi
-
-	# These versions built linuxthreads version to support tls, too
-	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
-
-	return 1
-}
diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2
deleted file mode 100644
index 863d1844..00000000
--- a/x11-drivers/nvidia-drivers/files/libGL.la-r2
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl'
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'
diff --git a/x11-drivers/nvidia-drivers/files/make-use-of-the-new-uapi-framework.patch b/x11-drivers/nvidia-drivers/files/make-use-of-the-new-uapi-framework.patch
deleted file mode 100644
index b408b6ae..00000000
--- a/x11-drivers/nvidia-drivers/files/make-use-of-the-new-uapi-framework.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 7 Nov 2012 12:03:46 +0100
-Subject: [PATCH 1/2] Make use of the new uapi framework
-
----
- conftest.sh |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/conftest.sh b/conftest.sh
-index 388e268..8eff4d7 100755
---- a/conftest.sh
-+++ b/conftest.sh
-@@ -20,6 +20,7 @@ ARCH=$3
- ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
- SOURCES=$4
- HEADERS=$SOURCES/include
-+HEADERSA=$SOURCES/include/uapi
- OUTPUT=$5
- XEN_PRESENT=1
- 
-@@ -118,7 +119,7 @@ build_cflags() {
-         fi
-     fi
- 
--    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     test_xen
- 
-@@ -146,10 +147,10 @@ build_cflags() {
-         fi
-     fi
- 
--    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-+    CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
-     fi
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia
deleted file mode 100644
index 7cf0f7c0..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia
+++ /dev/null
@@ -1,40 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#
-#   To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-#        Value		Meaning
-#        ----------	--------------------------------------------------
-#        0xFFFFFFFF	let the kernel module autodetect the correct value
-#        1		Dell laptops
-#        2		non-Compal Toshiba laptops
-#        3		all other laptops
-#        4		Compal Toshiba laptops
-#        5		Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
deleted file mode 100644
index a96b0cd1..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-169.07
+++ /dev/null
@@ -1,14 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# options see /usr/share/doc/PACKAGE/README 
-#
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.10.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.10.patch
deleted file mode 100644
index 9d3016ba..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.10.patch
+++ /dev/null
@@ -1,714 +0,0 @@
-From c3248bb6c976c112e9efa9e8f202590b2f9b40a5 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Tue, 18 Jun 2013 15:16:18 +0200
-Subject: [PATCH 1/1] Add support for Linux 3.10
-
----
- nv-i2c.c   |   13 +--
- nv-linux.h |    1 +
- nv.c       |  375 ++++++++++++++++++++++++++++++++++++++----------------------
- 3 files changed, 241 insertions(+), 148 deletions(-)
-
-diff --git a/nv-i2c.c b/nv-i2c.c
-index 143f9e4..aaee787 100644
---- a/usr/src/nv/nv-i2c.c
-+++ b/usr/src/nv/nv-i2c.c
-@@ -307,8 +307,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_state_t *nv, U032 port)
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -320,15 +318,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
--
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff --git a/nv-linux.h b/nv-linux.h
-index 963e059..9aac81a 100644
---- a/usr/src/nv/nv-linux.h
-+++ b/usr/src/nv/nv-linux.h
-@@ -163,6 +163,7 @@
- 
- #ifdef CONFIG_PROC_FS
- #include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
- #endif
- 
- #ifdef CONFIG_MTRR
-diff --git a/nv.c b/nv.c
-index f82e46f..570c266 100644
---- a/usr/src/nv/nv.c
-+++ b/usr/src/nv/nv.c
-@@ -291,7 +291,6 @@ void NV_API_CALL nv_verify_pci_config(nv_state_t *nv, BOOL check_the_bars)
- 
- /* nvos_ functions.. do not take a state device parameter  */
- static void     nvos_proc_create(void);
--static void     nvos_proc_remove_all(struct proc_dir_entry *);
- static void     nvos_proc_remove(void);
- static int      nvos_count_devices(nv_stack_t *);
- 
-@@ -333,12 +332,34 @@ void          nv_kern_rc_timer(unsigned long);
- static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
- 
--static int    nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_status(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_registry(char *, char **, off_t off, int, int *, void *);       
--static int    nv_kern_read_agpinfo(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_version(char *, char **, off_t off, int, int *, void *);
--static int    nv_kern_read_text_file(char *, char **, off_t off, int, int *, void *);
-+static const struct file_operations nv_procfs_text_fops;
-+static const struct file_operations nv_procfs_read_card_info_fops;
-+static const struct file_operations nv_procfs_version_fops;
-+static const struct file_operations nv_procfs_read_agp_info_fops;
-+static const struct file_operations nv_procfs_read_agp_info_gpu_fops;
-+static const struct file_operations nv_procfs_read_agp_status_fops;
-+static const struct file_operations nv_procfs_registry_fops;
-+
-+static int nv_procfs_show_text_file(struct seq_file *, void *);
-+static int nv_procfs_open_text_file(struct inode *, struct file *);
-+static void nvos_proc_add_text_file(struct proc_dir_entry *, const char *, const char *);
-+
-+static int nv_procfs_show_card_info(struct seq_file *, void *);
-+static int nv_procfs_read_card_info(struct inode *, struct file *);
-+
-+static int nv_procfs_show_version(struct seq_file *, void *);
-+static int nv_procfs_open_version(struct inode *, struct file *);
-+
-+static int nv_procfs_show_agp_info(struct seq_file *, void *);
-+static int nv_procfs_read_agp_info(struct inode *, struct file *);
-+
-+static int nv_procfs_read_agp_info_gpu(struct inode *, struct file *file);
-+static int nv_procfs_show_agp_status(struct seq_file *, void *);
-+static int nv_procfs_read_agp_status(struct inode *, struct file *);
-+
-+static int nv_procfs_show_registry(struct seq_file *, void *);
-+static int nv_procfs_open_registry(struct inode *, struct file *);
-+
- 
- int           nv_kern_ctl_open(struct inode *, struct file *);
- int           nv_kern_ctl_close(struct inode *, struct file *);
-@@ -604,6 +625,12 @@ static struct pci_dev* nv_get_pci_device(nv_state_t *nv)
-     return NULL;
- }
- 
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+static inline void *PDE_DATA(const struct inode *inode) {
-+	return PDE(inode)->data;
-+}
-+#endif
-+
- static void nvos_proc_create(void)
- {
- #ifdef CONFIG_PROC_FS
-@@ -623,19 +650,19 @@ static void nvos_proc_create(void)
-     nv_state_t *nv;
-     nv_linux_state_t *nvl;
- 
--    proc_nvidia = create_proc_entry("driver/nvidia", d_flags, NULL);
-+    proc_nvidia = proc_mkdir_mode("driver/nvidia", d_flags, NULL);
-     if (!proc_nvidia)
-         goto failed;
- 
--    proc_nvidia_cards = create_proc_entry("cards", d_flags, proc_nvidia);
-+    proc_nvidia_cards = proc_mkdir_mode("cards", d_flags, proc_nvidia);
-     if (!proc_nvidia_cards)
-         goto failed;
- 
--    proc_nvidia_warnings = create_proc_entry("warnings", d_flags, proc_nvidia);
-+    proc_nvidia_warnings = proc_mkdir_mode("warnings", d_flags, proc_nvidia);
-     if (!proc_nvidia_warnings)
-         goto failed;
- 
--    proc_nvidia_patches = create_proc_entry("patches", d_flags, proc_nvidia);
-+    proc_nvidia_patches = proc_mkdir_mode("patches", d_flags, proc_nvidia);
-     if (!proc_nvidia_patches)
-         goto failed;
- 
-@@ -660,24 +687,19 @@ static void nvos_proc_create(void)
-             break;
- 
-         sprintf(name, "%d", i++);
--        entry = create_proc_entry(name, flags, proc_nvidia_cards);
-+        entry = proc_create_data(name, flags, proc_nvidia_cards,
-+                &nv_procfs_read_card_info_fops, nv);
-         if (!entry) {
-             NV_PCI_DEV_PUT(dev);
-             goto failed;
-         }
- 
--        entry->data = nv;
--        entry->read_proc = nv_kern_read_cardinfo;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--        entry->owner = THIS_MODULE;
--#endif
--
-         if (nvos_find_agp_capability(dev)) {
-             /*
-              * Create the /proc/driver/nvidia/agp/{status,host-bridge,card}
-              * entries now that we know there's AGP hardware.
-              */
--            entry = create_proc_entry("agp", d_flags, proc_nvidia);
-+            entry = proc_mkdir_mode("agp", d_flags, proc_nvidia);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-@@ -688,72 +710,78 @@ static void nvos_proc_create(void)
- #endif
-             proc_nvidia_agp = entry;
- 
--            entry = create_proc_entry("status", flags, proc_nvidia_agp);
-+            entry = proc_create_data("status", flags, proc_nvidia_agp,
-+                &nv_procfs_read_agp_status_fops, nv);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-             }
- 
--            entry->data = nv;
--            entry->read_proc = nv_kern_read_status;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--            entry->owner = THIS_MODULE;
--#endif
-+            entry = proc_create("host-bridge", flags, proc_nvidia_agp,
-+                &nv_procfs_read_agp_info_fops);
- 
--            entry = create_proc_entry("host-bridge", flags, proc_nvidia_agp);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-             }
- 
--            entry->data = NULL;
--            entry->read_proc = nv_kern_read_agpinfo;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--            entry->owner = THIS_MODULE;
--#endif
--
--            entry = create_proc_entry("card", flags, proc_nvidia_agp);
-+            entry = proc_create_data("card", flags, proc_nvidia_agp,
-+                &nv_procfs_read_agp_info_gpu_fops, nv);
-             if (!entry) {
-                 NV_PCI_DEV_PUT(dev);
-                 goto failed;
-             }
- 
--            entry->data = nv;
--            entry->read_proc = nv_kern_read_agpinfo;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--            entry->owner = THIS_MODULE;
--#endif
-         }
- 
-         NV_PCI_DEV_PUT(dev);
-     }
- 
--    entry = create_proc_entry("version", flags, proc_nvidia);
-+    entry = proc_create("version", flags, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
--    entry->read_proc = nv_kern_read_version;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--    entry->owner = THIS_MODULE;
--#endif
--
--    entry = create_proc_entry("registry", flags, proc_nvidia);
-+    entry = proc_create("registry", flags, proc_nvidia,
-+        &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
--    entry->read_proc = nv_kern_read_registry;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--    entry->owner = THIS_MODULE;
--#endif
--
-     return;
- 
- failed:
-     nv_printf(NV_DBG_ERRORS, "NVRM: failed to create /proc entries!\n");
--    nvos_proc_remove_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
- 
-+static int
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "%s", (char *)m->private);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nvos_proc_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -762,41 +790,18 @@ nvos_proc_add_text_file(
- )
- {
- #ifdef CONFIG_PROC_FS
--    struct proc_dir_entry *entry;
--
-     /* world readable file */
-     int flags = S_IFREG | S_IRUGO;
- 
--    entry = create_proc_entry(filename, flags, parent);
--    if (!entry) return;
--
--    entry->data = (void *)text;
--    entry->read_proc = nv_kern_read_text_file;
--#if defined(NV_PROC_DIR_ENTRY_HAS_OWNER)
--    entry->owner = THIS_MODULE;
--#endif
-+    proc_create_data(filename, flags, parent, &nv_procfs_text_fops,
-+        (void *)text);
- #endif
- }
- 
--#ifdef CONFIG_PROC_FS
--static void nvos_proc_remove_all(struct proc_dir_entry *entry)
--{
--    while (entry) {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nvos_proc_remove_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
--}
--#endif
--
- static void nvos_proc_remove(void)
- {
- #ifdef CONFIG_PROC_FS
--    nvos_proc_remove_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
- 
-@@ -3065,18 +3070,19 @@ void   NV_API_CALL  nv_set_dma_address_size(
- }
- 
- static int
--nv_kern_read_cardinfo(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_card_info(
-+    struct seq_file *m,
-+    void *v
-+)
- {
-     struct pci_dev *dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     U032 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     nv_stack_t *sp = NULL;
- 
-     nv_state_t *nv;
--    nv = (nv_state_t *) data;
--    *eof = 1;
-+    nv = (nv_state_t *) m->private;
- 
-     dev = nv_get_pci_device(nv);
-     if (!dev)
-@@ -3094,38 +3100,38 @@ nv_kern_read_cardinfo(char *page, char **start, off_t off,
-         strcpy (tmpstr, "Unknown");
-     }
-     
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     status = rm_get_vbios_version(sp, nv, &vbios_rev1, &vbios_rev2,
-                                   &vbios_rev3, &vbios_rev4, &vbios_rev5);
- 
-     if (status < 0) {
-         /* before rm_init_adapter */
--        len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+        seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-     } else {
-         fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--        len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+        seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                                                   vbios_rev4, vbios_rev5);
-     }
- 
-     if (nvos_find_agp_capability(dev)) type = "AGP";
-     else if (nvos_find_pci_express_capability(dev)) type = "PCI-E";
-     else type = "PCI";
--    len += sprintf(page+len, "Card Type: \t %s\n", type);
-+    seq_printf(m, "Card Type: \t %s\n", type);
- 
-     // Report the number of bits set in dev->dma_mask
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %02x.%02x.%x\n",
-                    nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #ifdef DEBUG
-     do
-     {
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
--            len += sprintf(page+len, "BAR%i: \t\t 0x%08x (%iMB)\n",
-+            seq_printf(m, "BAR%i: \t\t 0x%08x (%iMB)\n",
-                            j, nv->bars[j].address, nv->bars[j].size >> 20);
-     } while(0);
- #endif
-@@ -3133,35 +3139,68 @@ nv_kern_read_cardinfo(char *page, char **start, off_t off,
-     NV_KMEM_CACHE_FREE_STACK(sp);
-  
-     NV_PCI_DEV_PUT(dev);
--    return len;
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_read_card_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_card_info, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_read_card_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_card_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static int
--nv_kern_read_version(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
- {
--    int len = 0;
--    *eof = 1;
--    
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
--    
--    return len;
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
- }
- 
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static int
--nv_kern_read_agpinfo(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_agp_info(
-+    struct seq_file *m,
-+    void *v
-+)
- {
-     struct pci_dev *dev;
-     char   *fw, *sba;
-     u8     cap_ptr;
-     u32    status, command, agp_rate;
--    int    len = 0;
-     
-     nv_state_t *nv;
--    nv = (nv_state_t *) data;
--    *eof = 1;
-+    nv = (nv_state_t *) m->private;
- 
-     if (nv) {
-         dev = nv_get_pci_device(nv);
-@@ -3172,12 +3211,12 @@ nv_kern_read_agpinfo(char *page, char **start, off_t off,
-         if (!dev)
-             return 0;
- 
--        len += sprintf(page+len, "Host Bridge: \t ");
-+        seq_printf(m, "Host Bridge: \t ");
- 
- #if defined(CONFIG_PCI_NAMES)
--        len += sprintf(page+len, "%s\n", NV_PCI_DEVICE_NAME(dev));
-+        seq_printf(m, "%s\n", NV_PCI_DEVICE_NAME(dev));
- #else
--        len += sprintf(page+len, "PCI device %04x:%04x\n",
-+        seq_printf(m, "PCI device %04x:%04x\n",
-                 dev->vendor, dev->device);
- #endif
-     }
-@@ -3191,40 +3230,74 @@ nv_kern_read_agpinfo(char *page, char **start, off_t off,
-     fw  = (status & 0x00000010) ? "Supported" : "Not Supported";
-     sba = (status & 0x00000200) ? "Supported" : "Not Supported";
- 
--    len += sprintf(page+len, "Fast Writes: \t %s\n", fw);
--    len += sprintf(page+len, "SBA: \t\t %s\n", sba);
-+    seq_printf(m, "Fast Writes: \t %s\n", fw);
-+    seq_printf(m, "SBA: \t\t %s\n", sba);
- 
-     agp_rate = status & 0x7;
-     if (status & 0x8) // agp 3.0
-         agp_rate <<= 2;
- 
--    len += sprintf(page+len, "AGP Rates: \t %s%s%s%s\n",
-+    seq_printf(m, "AGP Rates: \t %s%s%s%s\n",
-             (agp_rate & 0x00000008) ? "8x " : "",
-             (agp_rate & 0x00000004) ? "4x " : "",
-             (agp_rate & 0x00000002) ? "2x " : "",
-             (agp_rate & 0x00000001) ? "1x " : "");
- 
--    len += sprintf(page+len, "Registers: \t 0x%08x:0x%08x\n", status, command);
-+    seq_printf(m, "Registers: \t 0x%08x:0x%08x\n", status, command);
- 
-     NV_PCI_DEV_PUT(dev);
--    return len;
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_read_agp_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_agp_info, NULL);
- }
- 
-+static const struct file_operations nv_procfs_read_agp_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_agp_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static int
--nv_kern_read_status(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_read_agp_info_gpu(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_agp_info, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_read_agp_info_gpu_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_agp_info_gpu,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_agp_status(
-+    struct seq_file *m,
-+    void *v
-+)
- {
-     struct pci_dev *dev;
-     char   *fw, *sba, *drv;
--    int    len = 0;
-     u8     cap_ptr;
-     u32    scratch;
-     u32    status, command, agp_rate;
-     nv_stack_t *sp = NULL;
- 
-     nv_state_t *nv;
--    nv = (nv_state_t *) data;
--    *eof = 1;
-+    nv = (nv_state_t *) m->private;
- 
-     dev = nvos_get_agp_device_by_class(PCI_CLASS_BRIDGE_HOST);
-     if (!dev)
-@@ -3246,10 +3319,10 @@ nv_kern_read_status(char *page, char **start, off_t off,
-     command &= scratch;
- 
-     if (NV_AGP_ENABLED(nv) && (command & 0x100)) {
--        len += sprintf(page+len, "Status: \t Enabled\n");
-+        seq_printf(m, "Status: \t Enabled\n");
- 
-         drv = NV_OSAGP_ENABLED(nv) ? "AGPGART" : "NVIDIA";
--        len += sprintf(page+len, "Driver: \t %s\n", drv);
-+        seq_printf(m, "Driver: \t %s\n", drv);
- 
-         // mask off agp rate. 
-         // If this is agp 3.0, we need to shift the value
-@@ -3257,13 +3330,13 @@ nv_kern_read_status(char *page, char **start, off_t off,
-         if (status & 0x8) // agp 3.0
-             agp_rate <<= 2;
- 
--        len += sprintf(page+len, "AGP Rate: \t %dx\n", agp_rate);
-+        seq_printf(m, "AGP Rate: \t %dx\n", agp_rate);
- 
-         fw = (command & 0x00000010) ? "Enabled" : "Disabled";
--        len += sprintf(page+len, "Fast Writes: \t %s\n", fw);
-+        seq_printf(m, "Fast Writes: \t %s\n", fw);
- 
-         sba = (command & 0x00000200) ? "Enabled" : "Disabled";
--        len += sprintf(page+len, "SBA: \t\t %s\n", sba);
-+        seq_printf(m, "SBA: \t\t %s\n", sba);
-     } else {
-         int agp_config = 0;
- 
-@@ -3274,7 +3347,7 @@ nv_kern_read_status(char *page, char **start, off_t off,
-             return 0;
-         }
- 
--        len += sprintf(page+len, "Status: \t Disabled\n\n");
-+        seq_printf(m, "Status: \t Disabled\n\n");
- 
-         /*
-          * If we find AGP is disabled, but the RM registry indicates it
-@@ -3288,7 +3361,7 @@ nv_kern_read_status(char *page, char **start, off_t off,
-         rm_read_registry_dword(sp, nv, "NVreg", "XNvAGP", &agp_config);
- 
-         if (agp_config != NVOS_AGP_CONFIG_DISABLE_AGP && NV_AGP_FAILED(nv)) {
--            len += sprintf(page+len,
-+            seq_printf(m,
-                   "AGP initialization failed, please check the ouput  \n"
-                   "of the 'dmesg' command and/or your system log file \n"
-                   "for additional information on this problem.        \n");
-@@ -3298,37 +3371,63 @@ nv_kern_read_status(char *page, char **start, off_t off,
-     }
- 
-     NV_PCI_DEV_PUT(dev);
--    return len;
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_read_agp_status(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_agp_status, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_read_agp_status_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_read_agp_status,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- extern nv_parm_t nv_parms[];
- extern char *NVreg_RegistryDwords;
- 
- static int
--nv_kern_read_registry(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
- {
--    unsigned int i, len = 0;
-+    unsigned int i;
-     nv_parm_t *entry;
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_kern_read_text_file(char *page, char **start, off_t off,
--        int count, int *eof, void *data)
-+nv_procfs_open_registry(
-+    struct inode *inode,
-+    struct file  *file
-+)
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_registry, NULL);
- }
- 
-+static const struct file_operations nv_procfs_registry_fops = {
-+    .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- /***
-  *** EXPORTS to rest of resman
-  ***/
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.13.patch
deleted file mode 100644
index ab3de168..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/usr/src/nv/nvacpi.c
-+++ b/usr/src/nv/nvacpi.c
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.14.patch
deleted file mode 100644
index 47bb70bc..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173-3.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/usr/src/nv/nv-linux.h
-+++ b/usr/src/nv/nv-linux.h
-@@ -206,8 +206,7 @@ extern int nv_pat_mode;
- #endif
- 
- #if defined(CONFIG_ACPI) 
--#include <acpi/acpi.h>
--#include <acpi/acpi_drivers.h>
-+#include <linux/acpi.h>
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
deleted file mode 100644
index 32efbf12..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kernel.orig/nv-linux.h
-+++ kernel/nv-linux.h
-@@ -87,7 +87,6 @@
- #if !defined(KERNEL_2_4)
- #include <linux/sched.h>            /* suser(), capable() replacement   */
- #include <linux/moduleparam.h>      /* module_param()                   */
--#include <linux/smp_lock.h>         /* kernel_locked                    */
- #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
- #include <asm/kmap_types.h>         /* page table entry lookup          */
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-290.10-3.2.8+.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-290.10-3.2.8+.patch
deleted file mode 100644
index 4834f7b8..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-290.10-3.2.8+.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -122,7 +122,7 @@ build_cflags() {
-     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then
--        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated"
-     fi
-     if [ -n "$BUILD_PARAMS" ]; then
-         CFLAGS="$CFLAGS -D$BUILD_PARAMS"
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch
deleted file mode 100644
index 69c1ef85..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.13.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
---- a/kernel/uvm/nvidia_uvm_linux.h
-+++ b/kernel/uvm/nvidia_uvm_linux.h
-@@ -405,11 +405,17 @@ typedef void irqreturn_t;
- // not require the RCU's read lock on current->cred.
- //
- //
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+#define NV_KUID_TO_UID(value) (__kuid_val(value))
-+#else
-+#define NV_KUID_TO_UID(value) (value)
-+#endif
-+
- #if defined(NV_TASK_STRUCT_HAS_CRED)
- #define NV_CURRENT_EUID() \
--    (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
-+        NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel *)current->cred)->euid)
- #else
--#define NV_CURRENT_EUID() (current->euid)
-+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
- #endif
- 
- #define NV_ATOMIC_SET(data,val)         atomic_set(&(data), (val))
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.14.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.14.patch
deleted file mode 100644
index 48df3cba..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -273,8 +273,7 @@
- #endif
- 
- #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
--#include <acpi/acpi.h>
--#include <acpi/acpi_drivers.h>
-+#include <linux/acpi.h>
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.19.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.19.patch
deleted file mode 100644
index 3cdaa598..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-3.19.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl(
-     unsigned long i_arg
- )
- {
--    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
-+    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- 
- long nv_kern_compat_ioctl(
-@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl(
-     unsigned long i_arg
- )
- {
--    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
-+    return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
- }
- 
- /*
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.10.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.10.patch
deleted file mode 100644
index 514e671e..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.10.patch
+++ /dev/null
@@ -1,626 +0,0 @@
-diff -Nurp work.orig/kernel/nv-i2c.c work/kernel/nv-i2c.c
---- work.orig/kernel/nv-i2c.c	2013-07-04 13:19:12.255911539 +0000
-+++ work/kernel/nv-i2c.c	2013-07-04 13:08:08.479793566 +0000
-@@ -311,8 +311,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_s
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
--
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -Nurp work.orig/kernel/nv-procfs.c work/kernel/nv-procfs.c
---- work.orig/kernel/nv-procfs.c	2013-07-04 13:19:12.259244771 +0000
-+++ work/kernel/nv-procfs.c	2013-07-04 13:17:31.246205962 +0000
-@@ -60,60 +60,41 @@ static char nv_registry_keys[NV_MAX_REGI
-         __entry;                                          \
-     })
- 
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc,           \
--    __write_proc,__fops,__data)                                \
--   ({                                                          \
--        struct proc_dir_entry *__entry;                        \
--        int __mode = (S_IFREG | S_IRUGO);                      \
--        if ((NvUPtr)(__write_proc) != 0)                       \
--            __mode |= S_IWUSR;                                 \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
--        if (__entry != NULL)                                   \
--        {                                                      \
--            if ((NvUPtr)(__read_proc) != 0)                    \
--                __entry->read_proc = (__read_proc);            \
--            if ((NvUPtr)(__write_proc) != 0)                   \
--            {                                                  \
--                __entry->write_proc = (__write_proc);          \
--                __entry->proc_fops = (__fops);                 \
--            }                                                  \
--            __entry->data = (__data);                          \
--        }                                                      \
--        __entry;                                               \
--    })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
- 
- #define NV_CREATE_PROC_DIR(name,parent)                        \
-    ({                                                          \
-         struct proc_dir_entry *__entry;                        \
-         int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);            \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
-+        __entry = proc_mkdir_mode(name, __mode, parent);       \
-         __entry;                                               \
-     })
- 
-+//#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+//static inline void *PDE_DATA(const struct inode *inode) {
-+//	return PDE(inode)->data;
-+//}
-+//#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE   (64 * RM_PAGE_SIZE)
- 
- static int
--nv_procfs_read_gpu_info(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_gpu_info(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    nv_state_t *nv = data;
-+    nv_state_t *nv = m->private;
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     struct pci_dev *dev = nvl->dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     NvU8 *uuid;
-     NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
-     nv_stack_t *sp = NULL;
- 
--    *eof = 1;
--
-     NV_KMEM_CACHE_ALLOC_STACK(sp);
-     if (sp == NULL)
-     {
-@@ -134,31 +115,31 @@ nv_procfs_read_gpu_info(
-         if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
-                     dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
-                     tmpstr) != RM_OK)
--        {
-+ 		       {
-             strcpy (tmpstr, "Unknown");
-         }
-     }
- 
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     if (NV_IS_GVI_DEVICE(nv))
-     {
-         status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
-                                              &fpga_rev3);
-         if (status != RM_OK)
--            len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+            seq_printf(m, "Firmware: \t ????.??.??\n");
-         else
-         {
-             fmt = "Firmware: \t %x.%x.%x\n";
--            len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+            seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-         }
-     }
-     else
-     {
-         if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
-         {
--            len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+            seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
-             os_free_mem(uuid);
-         }
- 
-@@ -166,12 +147,12 @@ nv_procfs_read_gpu_info(
-                     &vbios_rev3, &vbios_rev4,
-                     &vbios_rev5) != RM_OK)
-         {
--            len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+            seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-         }
-         else
-         {
-             fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--            len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+            seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                            vbios_rev4, vbios_rev5);
-         }
-     }
-@@ -182,12 +163,12 @@ nv_procfs_read_gpu_info(
-         type = "PCI-E";
-     else
-         type = "PCI";
--    len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+    seq_printf(m, "Bus Type: \t %s\n", type);
- 
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
-                    nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
-     do
-@@ -195,7 +176,7 @@ nv_procfs_read_gpu_info(
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
-         {
--            len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+            seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-                            j, nv->bars[j].address, (nv->bars[j].size >> 20));
-         }
-     } while (0);
-@@ -203,26 +184,120 @@ nv_procfs_read_gpu_info(
- 
-     NV_KMEM_CACHE_FREE_STACK(sp);
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_version(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_gpu_info(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    int len = 0;
--    *eof = 1;
-+    return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
- 
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_gpu_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    return len;
-+static int
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    nv_state_t *nv = m->private;
-+    nv_linux_state_t *nvl = NULL;
-+    char *registry_keys;
-+
-+    if (nv != NULL)
-+        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    registry_keys = ((nvl != NULL) ?
-+            nvl->registry_keys : nv_registry_keys);
-+
-+    seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+    return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+    struct file       *file,
-+    const char __user *buffer,
-+    size_t             count,
-+    loff_t            *pos
-+)
-+{
-+    int status = 0;
-+    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+    char *proc_buffer;
-+    unsigned long bytes_left;
-+
-+    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+    if (count == 0)
-+    {
-+        status = -EINVAL;
-+        goto done;
-+    }
-+    else if ((bytes_left == 0) || (count > bytes_left))
-+    {
-+        status = -ENOSPC;
-+        goto done;
-+    }
-+
-+    proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+    if (copy_from_user(proc_buffer, buffer, count))
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+        status = -EFAULT;
-+    }
-+    else
-+    {
-+        nvfp->proc_data = PDE_DATA(file->f_inode);
-+        nvfp->off += count;
-+    }
-+
-+done:
-+    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    return ((status < 0) ? status : count);
- }
- 
- static struct pci_dev *nv_get_agp_device_by_class(unsigned int class)
-@@ -432,7 +507,7 @@ nv_procfs_open_registry(
-     nv_stack_t *sp = NULL;
- 
-     if (0 == (file->f_mode & FMODE_WRITE))
--        return 0;
-+        return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
- 
-     nvfp = nv_alloc_file_private();
-     if (nvfp == NULL)
-@@ -481,6 +556,9 @@ nv_procfs_close_registry(
-     RM_STATUS rm_status;
-     int rc = 0;
- 
-+    if (0 == (file->f_mode & FMODE_WRITE))
-+        return single_release(inode, file);
-+
-     nvfp = NV_GET_FILE_PRIVATE(file);
-     if (nvfp == NULL)
-         return 0;
-@@ -545,122 +623,81 @@ done:
-     return rc;
- }
- 
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
-     .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .write   = nv_procfs_write_registry,
-     .release = nv_procfs_close_registry,
- };
- 
- static int
--nv_procfs_read_params(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_params(
-+    struct seq_file *m,
-+    void *v
- )
- {
-     unsigned int i;
--    int len = 0;
-     nv_parm_t *entry;
- 
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
--    len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+    seq_printf(m, "RmMsg: \"%s\"\n",
-                 (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_registry(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
--)
-+nv_procfs_open_params(
-+    struct inode *inode,
-+    struct file *file
-+)    
- {
--    nv_state_t *nv = data;
--    nv_linux_state_t *nvl = NULL;
--    char *registry_keys;
-+    return single_open(file, nv_procfs_show_params, NULL);
-+}
- 
--    if (nv != NULL)
--        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    registry_keys = ((nvl != NULL) ?
--            nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_params,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    *eof = 1;
--    return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
- 
- static int
--nv_procfs_write_registry(
--    struct file   *file,
--    const char    *buffer,
--    unsigned long  count,
--    void          *data
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    int status = 0;
--    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
--    char *proc_buffer;
--    unsigned long bytes_left;
--
--    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+    seq_printf(m, "%s", (char *)m->private);
- 
--    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
--
--    if (count == 0)
--    {
--        status = -EINVAL;
--        goto done;
--    }
--    else if ((bytes_left == 0) || (count > bytes_left))
--    {
--        status = -ENOSPC;
--        goto done;
--    }
--
--    proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
--    if (copy_from_user(proc_buffer, buffer, count))
--    {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
--        status = -EFAULT;
--    }
--    else
--    {
--        nvfp->proc_data = data;
--        nvfp->off += count;
--    }
--
--done:
--    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    return ((status < 0) ? status : (int)count);
-+    return 0;
- }
- 
- static int
--nv_procfs_read_text_file(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -668,22 +705,7 @@ nv_procfs_add_text_file(
-     const char *text
- )
- {
--    NV_CREATE_PROC_FILE(filename, parent,
--            nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
--    while (entry)
--    {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nv_procfs_unregister_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
-+    proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
- 
-@@ -713,26 +735,11 @@ int nv_register_procfs(void)
-     if (!proc_nvidia)
-         goto failed;
- 
--    entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
--        nv_procfs_read_params, NULL, NULL, NULL);
-+    entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
-     if (!entry)
-         goto failed;
- 
--    /*
--     * entry->proc_fops originally points to a constant
--     * structure, so to add more methods for the
--     * binary registry write path, we need to replace the
--     * said entry->proc_fops with a new fops structure.
--     * However, in preparation for this, we need to preserve
--     * the procfs read() and write() operations.
--     */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
--
--    entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
--        nv_procfs_read_registry,
--        nv_procfs_write_registry,
--        &nv_procfs_registry_fops, NULL);
-+    entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -753,8 +760,7 @@ int nv_register_procfs(void)
- 
-     nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- 
--    entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
--        nv_procfs_read_version, NULL, NULL, NULL);
-+    entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -771,15 +777,11 @@ int nv_register_procfs(void)
-         if (!proc_nvidia_gpu)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
--            nv_procfs_read_gpu_info, NULL, NULL, nv);
-+	entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
-         if (!entry)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
--            nv_procfs_read_registry,
--            nv_procfs_write_registry,
--            &nv_procfs_registry_fops, nv);
-+	entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
-         if (!entry)
-             goto failed;
- 
-@@ -789,18 +791,15 @@ int nv_register_procfs(void)
-             if (!proc_nvidia_agp)
-                 goto failed;
- 
--            entry = NV_CREATE_PROC_FILE("status", proc_nvidia_agp,
--                nv_procfs_read_agp_status, NULL, NULL, nv);
-+	    entry = proc_create("status", NV_PROC_RO, proc_nvidia_agp, &nv_procfs_read_agp_status);
-             if (!entry)
-                 goto failed;
- 
--            entry = NV_CREATE_PROC_FILE("host-bridge", proc_nvidia_agp,
--                nv_procfs_read_agp_info, NULL, NULL, NULL);
-+	    entry = proc_create("host-bridge", NV_PROC_RO, proc_nvidia_agp, &nv_procfs_read_agp_info);
-             if (!entry)
-                 goto failed;
- 
--            entry = NV_CREATE_PROC_FILE("gpu", proc_nvidia_agp,
--                nv_procfs_read_agp_info, NULL, NULL, nv);
-+	    entry = proc_create("gpu", NV_PROC_RO, proc_nvidia_agp, &nv_procfs_read_agp_info);
-             if (!entry)
-                 goto failed;
-         }
-@@ -809,7 +808,7 @@ int nv_register_procfs(void)
-     return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
-     return -1;
- #endif
- }
-@@ -817,6 +816,6 @@ failed:
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.13.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.13.patch
deleted file mode 100644
index 90b10036..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-304-3.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/kernel/nv-acpi.c
-+++ b/kernel/nv-acpi.c
-@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
- 
-     if (pNvAcpiObject->notify_handler_installed)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
-         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
-+#endif
- 
-         // remove event notifier
-         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-3.8.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-3.8.patch
deleted file mode 100644
index bf2f95e6..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-313.18-3.8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9100c380c0a8c15b658b3153c107cd99e7110a7b Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 9 Jan 2013 11:42:03 +0100
-Subject: [PATCH 1/1] Add support for Linux 3.8
-
----
- conftest.sh |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/conftest.sh b/conftest.sh
-index 9720cab..1bfbe6f 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -160,6 +160,7 @@ build_cflags() {
- 
-     if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+        CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
-         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
-         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
-     elif [ "$ARCH" = "arm" ]; then
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-319.23-3.10.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-319.23-3.10.patch
deleted file mode 100644
index b81967bb..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-319.23-3.10.patch
+++ /dev/null
@@ -1,604 +0,0 @@
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c
---- NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-i2c.c	2013-04-26 00:22:30.000000000 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-i2c.c	2013-05-13 05:20:55.571981365 -0400
-@@ -311,8 +311,6 @@
- BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
- {
-     struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data;
--    int osstatus = 0;
--    BOOL wasReleased = FALSE;
- 
- #if defined(KERNEL_2_4)
-     if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter))
-@@ -324,15 +322,10 @@
-     if (!pI2cAdapter) return FALSE;
- 
-     // attempt release with the OS
--    osstatus = i2c_del_adapter(pI2cAdapter);
-+    i2c_del_adapter(pI2cAdapter);
-+    os_free_mem(pI2cAdapter);
- 
--    if (!osstatus)
--    {
--        os_free_mem(pI2cAdapter);
--        wasReleased = TRUE;
--    }
--
--    return wasReleased;
-+    return TRUE;
- }
- 
- #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE))
-diff -ur -X - NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c
---- NVIDIA-Linux-x86_64-319.17-no-compat32.orig/kernel/nv-procfs.c	2013-04-26 00:22:30.000000000 -0400
-+++ NVIDIA-Linux-x86_64-319.17-no-compat32/kernel/nv-procfs.c	2013-05-22 04:52:45.229495748 -0400
-@@ -60,60 +60,41 @@
-         __entry;                                          \
-     })
- 
--#define NV_CREATE_PROC_FILE(name,parent,__read_proc,           \
--    __write_proc,__fops,__data)                                \
--   ({                                                          \
--        struct proc_dir_entry *__entry;                        \
--        int __mode = (S_IFREG | S_IRUGO);                      \
--        if ((NvUPtr)(__write_proc) != 0)                       \
--            __mode |= S_IWUSR;                                 \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
--        if (__entry != NULL)                                   \
--        {                                                      \
--            if ((NvUPtr)(__read_proc) != 0)                    \
--                __entry->read_proc = (__read_proc);            \
--            if ((NvUPtr)(__write_proc) != 0)                   \
--            {                                                  \
--                __entry->write_proc = (__write_proc);          \
--                __entry->proc_fops = (__fops);                 \
--            }                                                  \
--            __entry->data = (__data);                          \
--        }                                                      \
--        __entry;                                               \
--    })
-+#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
-+#define NV_PROC_RO (S_IFREG|S_IRUGO)
- 
- #define NV_CREATE_PROC_DIR(name,parent)                        \
-    ({                                                          \
-         struct proc_dir_entry *__entry;                        \
-         int __mode = (S_IFDIR | S_IRUGO | S_IXUGO);            \
--        __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent);  \
-+        __entry = proc_mkdir_mode(name, __mode, parent);       \
-         __entry;                                               \
-     })
- 
-+//#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
-+//static inline void *PDE_DATA(const struct inode *inode) {
-+//	return PDE(inode)->data;
-+//}
-+//#endif
-+
- #define NV_PROC_WRITE_BUFFER_SIZE   (64 * RM_PAGE_SIZE)
- 
- static int
--nv_procfs_read_gpu_info(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_gpu_info(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    nv_state_t *nv = data;
-+    nv_state_t *nv = m->private;
-     nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-     struct pci_dev *dev = nvl->dev;
-     char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
--    int len = 0, status;
-+    int status;
-     NvU8 *uuid;
-     NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
-     NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
-     nv_stack_t *sp = NULL;
- 
--    *eof = 1;
--
-     NV_KMEM_CACHE_ALLOC_STACK(sp);
-     if (sp == NULL)
-     {
-@@ -134,31 +115,31 @@
-         if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
-                     dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
-                     tmpstr) != RM_OK)
--        {
-+ 		       {
-             strcpy (tmpstr, "Unknown");
-         }
-     }
- 
--    len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
--    len += sprintf(page+len, "IRQ:   \t\t %d\n", nv->interrupt_line);
-+    seq_printf(m, "Model: \t\t %s\n", tmpstr);
-+    seq_printf(m, "IRQ:   \t\t %d\n", nv->interrupt_line);
- 
-     if (NV_IS_GVI_DEVICE(nv))
-     {
-         status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
-                                              &fpga_rev3);
-         if (status != RM_OK)
--            len += sprintf(page+len, "Firmware: \t ????.??.??\n");
-+            seq_printf(m, "Firmware: \t ????.??.??\n");
-         else
-         {
-             fmt = "Firmware: \t %x.%x.%x\n";
--            len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-+            seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
-         }
-     }
-     else
-     {
-         if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
-         {
--            len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
-+            seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
-             os_free_mem(uuid);
-         }
- 
-@@ -166,12 +147,12 @@
-                     &vbios_rev3, &vbios_rev4,
-                     &vbios_rev5) != RM_OK)
-         {
--            len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
-+            seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
-         }
-         else
-         {
-             fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
--            len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-+            seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
-                            vbios_rev4, vbios_rev5);
-         }
-     }
-@@ -180,12 +161,12 @@
-         type = "PCI-E";
-     else
-         type = "PCI";
--    len += sprintf(page+len, "Bus Type: \t %s\n", type);
-+    seq_printf(m, "Bus Type: \t %s\n", type);
- 
--    len += sprintf(page+len, "DMA Size: \t %d bits\n",
-+    seq_printf(m, "DMA Size: \t %d bits\n",
-      nv_count_bits(dev->dma_mask));
--    len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
--    len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
-+    seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
-+    seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
-                    nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
- #if defined(DEBUG)
-     do
-@@ -193,7 +174,7 @@
-         int j;
-         for (j = 0; j < NV_GPU_NUM_BARS; j++)
-         {
--            len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-+            seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
-                            j, nv->bars[j].address, (nv->bars[j].size >> 20));
-         }
-     } while (0);
-@@ -201,26 +182,120 @@
- 
-     NV_KMEM_CACHE_FREE_STACK(sp);
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_version(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_gpu_info(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
-+}
-+
-+static const struct file_operations nv_procfs_gpu_info_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_gpu_info,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_version(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
-+    seq_printf(m, "GCC version:  %s\n", NV_COMPILER);
-+
-+    return 0;
-+}
-+
-+static int
-+nv_procfs_open_version(
-+    struct inode *inode,
-+    struct file *file
-+)
-+{
-+    return single_open(file, nv_procfs_show_version, NULL);
-+}
-+
-+static const struct file_operations nv_procfs_version_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_version,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
-+static int
-+nv_procfs_show_registry(
-+    struct seq_file *m,
-+    void *v
-+)
-+{
-+    nv_state_t *nv = m->private;
-+    nv_linux_state_t *nvl = NULL;
-+    char *registry_keys;
-+
-+    if (nv != NULL)
-+        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    registry_keys = ((nvl != NULL) ?
-+            nvl->registry_keys : nv_registry_keys);
-+
-+    seq_printf(m, "Binary: \"%s\"\n", registry_keys);
-+
-+    return 0;
-+}
-+
-+static ssize_t
-+nv_procfs_write_registry(
-+    struct file       *file,
-+    const char __user *buffer,
-+    size_t             count,
-+    loff_t            *pos
- )
- {
--    int len = 0;
--    *eof = 1;
-+    int status = 0;
-+    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
-+    char *proc_buffer;
-+    unsigned long bytes_left;
-+
-+    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
-+
-+    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+
-+    if (count == 0)
-+    {
-+        status = -EINVAL;
-+        goto done;
-+    }
-+    else if ((bytes_left == 0) || (count > bytes_left))
-+    {
-+        status = -ENOSPC;
-+        goto done;
-+    }
-+
-+    proc_buffer = &((char *)nvfp->data)[nvfp->off];
-+
-+    if (copy_from_user(proc_buffer, buffer, count))
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
-+        status = -EFAULT;
-+    }
-+    else
-+    {
-+        nvfp->proc_data = PDE_DATA(file->f_inode);
-+        nvfp->off += count;
-+    }
- 
--    len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
--    len += sprintf(page+len, "GCC version:  %s\n", NV_COMPILER);
-+done:
-+    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
- 
--    return len;
-+    return ((status < 0) ? status : count);
- }
- 
- static int
-@@ -233,7 +308,7 @@
-     nv_stack_t *sp = NULL;
- 
-     if (0 == (file->f_mode & FMODE_WRITE))
--        return 0;
-+        return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
- 
-     nvfp = nv_alloc_file_private();
-     if (nvfp == NULL)
-@@ -282,6 +357,9 @@
-     RM_STATUS rm_status;
-     int rc = 0;
- 
-+    if (0 == (file->f_mode & FMODE_WRITE))
-+        return single_release(inode, file);
-+
-     nvfp = NV_GET_FILE_PRIVATE(file);
-     if (nvfp == NULL)
-         return 0;
-@@ -346,122 +424,81 @@
-     return rc;
- }
- 
--static struct file_operations nv_procfs_registry_fops = {
-+static const struct file_operations nv_procfs_registry_fops = {
-     .open    = nv_procfs_open_registry,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .write   = nv_procfs_write_registry,
-     .release = nv_procfs_close_registry,
- };
- 
- static int
--nv_procfs_read_params(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_show_params(
-+    struct seq_file *m,
-+    void *v
- )
- {
-     unsigned int i;
--    int len = 0;
-     nv_parm_t *entry;
- 
--    *eof = 1;
- 
-     for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
--        len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
-+        seq_printf(m, "%s: %u\n", entry->name, *entry->data);
- 
--    len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
-+    seq_printf(m, "RegistryDwords: \"%s\"\n",
-                 (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
--    len += sprintf(page+len, "RmMsg: \"%s\"\n",
-+    seq_printf(m, "RmMsg: \"%s\"\n",
-                 (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
- 
--    return len;
-+    return 0;
- }
- 
- static int
--nv_procfs_read_registry(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
--)
-+nv_procfs_open_params(
-+    struct inode *inode,
-+    struct file *file
-+)    
- {
--    nv_state_t *nv = data;
--    nv_linux_state_t *nvl = NULL;
--    char *registry_keys;
-+    return single_open(file, nv_procfs_show_params, NULL);
-+}
- 
--    if (nv != NULL)
--        nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    registry_keys = ((nvl != NULL) ?
--            nvl->registry_keys : nv_registry_keys);
-+static const struct file_operations nv_procfs_params_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_params,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
- 
--    *eof = 1;
--    return sprintf(page, "Binary: \"%s\"\n", registry_keys);
--}
- 
- static int
--nv_procfs_write_registry(
--    struct file   *file,
--    const char    *buffer,
--    unsigned long  count,
--    void          *data
-+nv_procfs_show_text_file(
-+    struct seq_file *m,
-+    void *v
- )
- {
--    int status = 0;
--    nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
--    char *proc_buffer;
--    unsigned long bytes_left;
--
--    down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
-+    seq_printf(m, "%s", (char *)m->private);
- 
--    if (count == 0)
--    {
--        status = -EINVAL;
--        goto done;
--    }
--    else if ((bytes_left == 0) || (count > bytes_left))
--    {
--        status = -ENOSPC;
--        goto done;
--    }
--
--    proc_buffer = &((char *)nvfp->data)[nvfp->off];
--
--    if (copy_from_user(proc_buffer, buffer, count))
--    {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
--        status = -EFAULT;
--    }
--    else
--    {
--        nvfp->proc_data = data;
--        nvfp->off += count;
--    }
--
--done:
--    up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
--
--    return ((status < 0) ? status : (int)count);
-+    return 0;
- }
- 
- static int
--nv_procfs_read_text_file(
--    char  *page,
--    char **start,
--    off_t  off,
--    int    count,
--    int   *eof,
--    void  *data
-+nv_procfs_open_text_file(
-+    struct inode *inode,
-+    struct file *file
- )
- {
--    *eof = 1;
--    return sprintf(page, "%s", (char *)data);
-+    return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
- }
- 
-+static const struct file_operations nv_procfs_text_fops = {
-+    .owner   = THIS_MODULE,
-+    .open    = nv_procfs_open_text_file,
-+    .read    = seq_read,
-+    .llseek  = seq_lseek,
-+    .release = single_release,
-+};
-+
- static void
- nv_procfs_add_text_file(
-     struct proc_dir_entry *parent,
-@@ -469,22 +506,7 @@
-     const char *text
- )
- {
--    NV_CREATE_PROC_FILE(filename, parent,
--            nv_procfs_read_text_file, NULL, NULL, (void *)text);
--}
--
--static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
--{
--    while (entry)
--    {
--        struct proc_dir_entry *next = entry->next;
--        if (entry->subdir)
--            nv_procfs_unregister_all(entry->subdir);
--        remove_proc_entry(entry->name, entry->parent);
--        if (entry == proc_nvidia)
--            break;
--        entry = next;
--    }
-+    proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
- }
- #endif
- 
-@@ -513,26 +535,11 @@
-     if (!proc_nvidia)
-         goto failed;
- 
--    entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
--        nv_procfs_read_params, NULL, NULL, NULL);
-+    entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
-     if (!entry)
-         goto failed;
- 
--    /*
--     * entry->proc_fops originally points to a constant
--     * structure, so to add more methods for the
--     * binary registry write path, we need to replace the
--     * said entry->proc_fops with a new fops structure.
--     * However, in preparation for this, we need to preserve
--     * the procfs read() and write() operations.
--     */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
--
--    entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
--        nv_procfs_read_registry,
--        nv_procfs_write_registry,
--        &nv_procfs_registry_fops, NULL);
-+    entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -553,8 +560,7 @@
- 
-     nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
- 
--    entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
--        nv_procfs_read_version, NULL, NULL, NULL);
-+    entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
-     if (!entry)
-         goto failed;
- 
-@@ -571,15 +577,11 @@
-         if (!proc_nvidia_gpu)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
--            nv_procfs_read_gpu_info, NULL, NULL, nv);
-+	entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
-         if (!entry)
-             goto failed;
- 
--        entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
--            nv_procfs_read_registry,
--            nv_procfs_write_registry,
--            &nv_procfs_registry_fops, nv);
-+	entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
-         if (!entry)
-             goto failed;
-     }
-@@ -587,7 +589,7 @@
-     return 0;
- #if defined(CONFIG_PROC_FS)
- failed:
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
-     return -1;
- #endif
- }
-@@ -595,6 +597,6 @@
- void nv_unregister_procfs(void)
- {
- #if defined(CONFIG_PROC_FS)
--    nv_procfs_unregister_all(proc_nvidia);
-+    remove_proc_subtree("nvidia", proc_nvidia);
- #endif
- }
-
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch
deleted file mode 100644
index 9777ce6c..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -757,16 +757,16 @@
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -794,7 +794,7 @@
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -924,7 +924,7 @@
-     nv->os_state = (void *) &nv_ctl_device;
-     nv_lock_init_locks(nv);
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -935,7 +935,7 @@
-     if (NV_BUILD_MODULE_INSTANCES == 0)
-     {
-         NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--                             nvidia_p2p_page_t);
-+                             nvidia_p2p_page_t, 0);
-         if (nvidia_p2p_page_t_cache == NULL)
-         {
-             rc = -ENOMEM;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch
deleted file mode 100644
index 9b9f53e4..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-constify.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/kernel/uvm/uvm_common.c
-+++ b/kernel/uvm/uvm_common.c
-@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_
- #endif // NVIDIA_UVM_NEXT_ENABLED
- 
- static dev_t g_uvmBaseDev;
--struct UvmOpsUvmEvents g_exportedUvmOps;
- 
- // TODO: This would be easier if RM allowed for multiple registrations, since we
- //       could register UVM-Lite and UVM-Next separately (bug 1372835).
-@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi
-     RM_STATUS status = RM_OK;
- 
- #ifdef NVIDIA_UVM_RM_ENABLED
--    g_exportedUvmOps.startDevice = uvm_gpu_event_start_device;
--    g_exportedUvmOps.stopDevice  = uvm_gpu_event_stop_device;
--    g_exportedUvmOps.isrTopHalf  = uvmnext_isr_top_half;
-+    static struct UvmOpsUvmEvents g_exportedUvmOps = {
-+        .startDevice = uvm_gpu_event_start_device,
-+        .stopDevice  = uvm_gpu_event_stop_device,
-+        .isrTopHalf  = uvmnext_isr_top_half,
-+    };
- 
-     // call RM to exchange the function pointers.
-     status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch
deleted file mode 100644
index d1a440c9..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-346.16-pax-usercopy.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -705,7 +705,7 @@ int __init nvidia_init_module(void)
- #endif
- 
-     nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,
--                                                nvidia_stack_t);
-+                                                nvidia_stack_t, SLAB_USERCOPY);
-     if (nvidia_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -846,7 +846,7 @@ int __init nvidia_init_module(void)
-     nv_lock_init_locks(nv);
- 
-     nvidia_pte_t_cache = NV_KMEM_CACHE_CREATE(nvidia_pte_cache_name,
--                                              nvidia_pte_t);
-+                                              nvidia_pte_t, 0);
-     if (nvidia_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -857,7 +857,7 @@ int __init nvidia_init_module(void)
-     if (!nv_multiple_kernel_modules)
-     {
-         nvidia_p2p_page_t_cache = NV_KMEM_CACHE_CREATE(nvidia_p2p_page_cache_name,
--                                                       nvidia_p2p_page_t);
-+                                                       nvidia_p2p_page_t, 0);
-         if (nvidia_p2p_page_t_cache == NULL)
-         {
-             rc = -ENOMEM;
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -1431,11 +1431,11 @@ extern void *nvidia_stack_t_cache;
- 
- #if !defined(NV_VMWARE)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(name, type)    \
--    kmem_cache_create(name, sizeof(type), 0, 0, NULL)
-+#define NV_KMEM_CACHE_CREATE(name, type, flags)    \
-+    kmem_cache_create(name, sizeof(type), 0, flags, NULL)
- #else
--#define NV_KMEM_CACHE_CREATE(name, type)    \
--    kmem_cache_create(name, sizeof(type), 0, 0, NULL, \
-+#define NV_KMEM_CACHE_CREATE(name, type, flags)    \
-+    kmem_cache_create(name, sizeof(type), 0, flags, NULL, \
-                       NULL)
- #endif
- #define NV_KMEM_CACHE_DESTROY(kmem_cache)   \
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-96.43.19-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-96.43.19-2.6.39.patch
deleted file mode 100644
index 4ee8ba60..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-96.43.19-2.6.39.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usr/src/nv/nv-linux.h.orig	2010-10-28 04:23:04.000000000 +0200
-+++ usr/src/nv/nv-linux.h	2011-05-21 08:58:35.714633248 +0200
-@@ -80,7 +80,6 @@
- #if !defined(KERNEL_2_4)
- #include <linux/sched.h>            /* suser(), capable() replacement   */
- #include <linux/moduleparam.h>      /* module_param()                   */
--#include <linux/smp_lock.h>         /* kernel_locked                    */
- #include <asm/tlbflush.h>           /* flush_tlb(), flush_tlb_all()     */
- #include <asm/kmap_types.h>         /* page table entry lookup          */
- #endif
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
deleted file mode 100644
index f3b82593..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Binary files kernel.orig/.nv-procfs.c.swp and kernel/.nv-procfs.c.swp differ
-diff -urp kernel.orig/nv-procfs.c kernel/nv-procfs.c
---- kernel.orig/nv-procfs.c	2011-07-13 03:29:30.000000000 +0200
-+++ kernel/nv-procfs.c	2011-07-19 15:45:27.982993911 +0200
-@@ -707,8 +707,10 @@ int nv_register_procfs(void)
-      * However, in preparation for this, we need to preserve
-      * the procfs read() and write() operations.
-      */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
-+    pax_open_kernel();
-+    *(void **)&nv_procfs_registry_fops.read = entry->proc_fops->read;
-+    *(void **)&nv_procfs_registry_fops.write = entry->proc_fops->write;
-+    pax_close_kernel();
- 
-     entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
-         nv_procfs_read_registry,
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
deleted file mode 100644
index ce8c201b..00000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urp kernel.orig/nv.c kernel/nv.c
---- kernel.orig/nv.c	2011-09-24 02:32:09.000000000 +0200
-+++ kernel/nv.c	2011-10-05 19:13:41.474242252 +0200
-@@ -1105,7 +1105,7 @@ static int __init nvidia_init_module(voi
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -1220,7 +1220,7 @@ static int __init nvidia_init_module(voi
-     }
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -1229,7 +1229,7 @@ static int __init nvidia_init_module(voi
-     }
- 
-     NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--            nvidia_p2p_page_t);
-+            nvidia_p2p_page_t, 0);
-     if (nvidia_p2p_page_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-diff -urp kernel.orig/nv-linux.h kernel/nv-linux.h
---- kernel.orig/nv-linux.h	2011-09-24 02:32:09.000000000 +0200
-+++ kernel/nv-linux.h	2011-10-05 19:14:42.522238996 +0200
-@@ -695,16 +695,16 @@ extern nv_spinlock_t km_lock;
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
diff --git a/x11-drivers/nvidia-drivers/files/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch b/x11-drivers/nvidia-drivers/files/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
deleted file mode 100644
index 51aa2851..00000000
--- a/x11-drivers/nvidia-drivers/files/replace-VM_RESERVED-with-VM_DONTEXPAND-and-VM_DONTDU.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Wed, 7 Nov 2012 12:11:02 +0100
-Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
-
----
- nv-mmap.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/nv-mmap.c b/nv-mmap.c
-index acc02ec..b2d5cdb 100644
---- a/nv-mmap.c
-+++ b/nv-mmap.c
-@@ -463,7 +463,11 @@ int nv_kern_mmap(
-         NV_PRINT_AT(NV_DBG_MEMINFO, at);
-         nv_vm_list_page_count(&at->page_table[i], pages);
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
-+        vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
-+#else
-         vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-+#endif
- 
- #if defined(VM_DRIVER_PAGES)
-         vma->vm_flags |= VM_DRIVER_PAGES;
--- 
-1.7.9.5
-
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
deleted file mode 100644
index b4cf3e70..00000000
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>lxnay@gentoo.org</email>
-  <description>General maintainer</description>
-</maintainer>
-<longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
-</pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
deleted file mode 100644
index 0c57deb1..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils unpacker portability versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
-	 x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags multilib kernel_linux"
-RESTRICT="strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="<x11-base/xorg-server-1.15.99
-	~x11-drivers/nvidia-userspace-${PV}
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	acpi? ( sys-power/acpid )"
-PDEPEND=""
-
-if use x86; then
-	PKG_V="-pkg0"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-pkg2"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
-	PKG_V=""
-	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	if linux_chkconfig_present LOCKDEP; then
-		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
-		eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
-		eerror "which will prevent ${P} from compiling."
-		eerror "Please make sure the following options have been unset:"
-		eerror "    Kernel hacking  --->"
-		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "        [ ] Lock debugging: prove locking correctness"
-		eerror "        [ ] Lock usage statistics"
-		eerror "in 'menuconfig'"
-		die "LOCKDEP enabled"
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-		mtrr_check
-		lockdep_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_SRC="${S}/src"
-	elif use kernel_linux; then
-		NV_SRC="${S}/usr/src/nv"
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${S}"
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${NV_SRC}"/Makefile.kbuild
-
-		# If you set this then it's your own fault when stuff breaks :)
-		use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	# Linux 3.13 support
-	epatch "${FILESDIR}/nvidia-drivers-173-3.13.patch"
-
-        # Linux 3.14 support
-        kernel_is ge 3 14 0 && epatch "${FILESDIR}/${PN}-173-3.14.patch"
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	elif use x86-fbsd; then
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-}
-
-pkg_postinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-	echo
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
deleted file mode 100644
index 4a60d0f0..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user versionator
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA GPUs kernel drivers"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X"
-RESTRICT="strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S="${WORKDIR}/"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-lockdep_check() {
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use kernel_FreeBSD; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/nvidia-drivers-pax-const.patch
-		epatch "${FILESDIR}"/nvidia-drivers-pax-usercopy.patch
-	fi
-	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/libnvidia-opencl.so
-	EOF
-
-	if kernel_is ge 3 19 0; then
-		epatch "${FILESDIR}/${PN}-3.19.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
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.67.ebuild
deleted file mode 100644
index e250156c..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.67.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		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}"/${P}-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
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-337.25.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.32.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.46.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.58.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.58.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.58.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
deleted file mode 100644
index bcfd2149..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
deleted file mode 100644
index 40237657..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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
-		use uvm && MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
deleted file mode 100644
index 027c511a..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-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
-
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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 kernel_is ge 4 0 ; then
-			epatch "${FILESDIR}"/${PN}-4.0.patch
-		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}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.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
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.59.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.59.ebuild
deleted file mode 100644
index c86373e8..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.59.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user
-
-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 GPUs kernel drivers"
-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="NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi custom-cflags multilib x-multilib kernel_FreeBSD kernel_linux pax_kernel tools X uvm"
-RESTRICT="bindist mirror strip"
-
-DEPEND="kernel_linux? ( virtual/linux-sources )"
-RDEPEND="~x11-drivers/nvidia-userspace-${PV}
-	x-multilib? ( ~x11-drivers/nvidia-userspace-${PV}[x-multilib] )
-	multilib? ( ~x11-drivers/nvidia-userspace-${PV}[multilib] )
-	~x11-drivers/nvidia-userspace-${PV}[tools=]
-	~x11-drivers/nvidia-userspace-${PV}[X=]"
-PDEPEND=""
-
-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
-
-	# 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
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		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_SRC="${S}/src"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_SRC="${S}/kernel"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	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}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.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
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-	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
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-pkg_preinst() {
-	use kernel_linux && linux-mod_pkg_preinst
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	echo
-	elog "You must be in the video group to use the NVIDIA device"
-	elog "For more info, read the docs at"
-	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
-	elog
-
-	elog "This package installs a kernel module and X driver. Both must"
-	elog "match explicitly in their version. This means, if you restart"
-	elog "X, you must modprobe -r nvidia before starting it back up"
-	elog
-
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-}