Fix dev-libs/glib SLOTting. Fix -96* *DEPEND. Version bump.

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

10 files changed, 586 insertions, 56 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 8d0795d9195b..9f885a26261f 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.608 2015/02/09 07:35:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.609 2015/03/04 10:19:40 jer Exp $
+
+*nvidia-drivers-346.47 (04 Mar 2015)
+
+  04 Mar 2015; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.23.ebuild,
+  nvidia-drivers-173.14.39.ebuild, nvidia-drivers-304.125.ebuild,
+  nvidia-drivers-331.113.ebuild, nvidia-drivers-340.76.ebuild,
+  nvidia-drivers-343.36.ebuild, nvidia-drivers-346.35.ebuild,
+  +nvidia-drivers-346.47.ebuild:
+  Fix dev-libs/glib SLOTting. Fix -96* *DEPEND. Version bump.
 
   09 Feb 2015; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-304.125.ebuild,
   nvidia-drivers-331.113.ebuild, nvidia-drivers-340.76.ebuild,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index b8bb646de6e9..f08d4ad14978 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -25,18 +25,21 @@ DIST NVIDIA-FreeBSD-x86-331.113.tar.gz 56371300 SHA256 f3b4b5ddf5977223646d2cdb0
 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.47.tar.gz 57996755 SHA256 f72639ef6474c9e0127a7ea85b54192353e49a5993f256b7e360b38e25ca5016 SHA512 1ca04823ef5949fe36fb4c2eba8c3833712ca5fbcfe8aa3dcc14c7b6c6888db465e4d5ba8c556539267d0157ff370f6272ffb2be5e1c5ba96b7855028f2738d6 WHIRLPOOL 300a05c9f47e86ff0a4bf0f1a0a8a616570edd77288026c2ec0504be451553907f2d231d4646e1cfe82df9abf23e75e5dedc62af604d8644947abd0b4cf72321
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
 DIST NVIDIA-FreeBSD-x86_64-331.113.tar.gz 47509194 SHA256 c848e187c79064ea3f52406312aa09d06f0aaef5063be7522b2b2319c43c872c SHA512 4e206719afcee47179e0756ac67fc4e61d513efb1cd0264b28726d6de16846feee873a2df362bf645b0527d395b6d82f5b54dbc447bccb74128d7bff37bb7b1b WHIRLPOOL a51b0bd9f7301d9bb76b54ffa44337ad4d875125281c4b9921e66a76d434879832f542df9c6ba436ef83fb3fa0afe5197f3425f1b7aa16274aca5080259f343d
 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.47.tar.gz 58745451 SHA256 663d7cb9570d594e7b49ec7560cdc86e80bf4fdba97580406a28286d031fe3f9 SHA512 15e0d52bc9e4a5fdfea6199f02d8f8f894e485c76acfadc8780bf7bbdc880362d5d6aa32a7ace315deefc5918f59ff037a53868044e8976fcf9e9dad6fb878fa WHIRLPOOL e2213718c11e22e93c208f210c6c43ebaa105fe2a4b27d94032d88177c1f039f6468c5a4a2bf76c5ff169f2d5419aef5c2e498cd1d1dca93843af69c2c4b7392
 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.113.run 37300924 SHA256 42535a99ab68452d30d9c3fad2fb162db01d1f6821115a3c1733ed203efd588b SHA512 bc820609e0379cc5805a5428cc364795b8a5d9e5a2a4395a1ddaa1dda85e6acc59368f87f5974a39fb42bd272458627b2c742fbf1f7fedddb17102439883b111 WHIRLPOOL 1d7b5cb8be5bb76dbe1b238aab4e39ccda0e5b07da268f0652966e79d5e0d2192773316d8f22a2d6a551305b17b610242918822e94e43263c9dbfba8a48bf49b
 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.47.run 41355779 SHA256 bb21527dfcd9855e3ae53ae5b56c29456902354c79f76d859d007068cdf76a6e SHA512 a12556da624e2b9f853683f1e335f814660c718403c047bde07c6b8ccaae80824eb791ac87a69801c18488a1e7cd55d8614562fca866d86ba6654e457cd65378 WHIRLPOOL e245c4c76353b432aee6b4dbdc02243cab60328642111d0ae9047afd2f4adeb6f46baafde9df16371a2b194405cf641b829f2e26c1e35abb535eb3c179ca6fcb
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
@@ -44,21 +47,23 @@ DIST NVIDIA-Linux-x86_64-331.113.run 60509547 SHA256 e9d5eb4394ef31825f7a86290b1
 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.47.run 73551445 SHA256 85ab28abe9defc2838839969b31aea647e0de34615fbfed3ba716205de365d0a SHA512 2eb3114d510f60ebe34eb13668d3fc470826a615e921fe1a38a0b8d1860e8a8723d0267f7c7db5733fe7a1fd3b2f01b4f0610069e6c2deddf1936804312d30e7 WHIRLPOOL 8d08efc953a9e7de6071684df42c023c2bbfc6cb25346ba2647fbf22682a1c33765e158ad9669c7251823312debb8d063768ea968b4a2271e5001e6749543972
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
-EBUILD nvidia-drivers-173.14.39.ebuild 16632 SHA256 816e5f5c38044481c7e0492b77ad15c7dd0e55aef64029af11ef18dbcab12ee2 SHA512 c568bfc2d749eedd2395d11cc47dce72aa1779a7b7af3e85814a63e1f647f5f43f6f26a4d5bd28ba0a4a5bf6f467eca72d93f66f4e60f1d17649e1740af171e5 WHIRLPOOL e871f44354d095f01b500ed9ed51b27d1d912bdf2c46219f931b85c0d560d997648dc24550012f07c47278802d0afc0cabe0f5c94b1197071026815c1c81d913
-EBUILD nvidia-drivers-304.125.ebuild 12588 SHA256 da6cb54de465424062184aa98c9048f2211d474e97259555b96b3199df26c786 SHA512 ac25a105f1127cddf444f2d4c72b8c8f1414d14d3d973d69b3375942ab905b173378007c5cee751f32095da8e7fe8ae2055f8d1f2fa59329d69808a5daa24060 WHIRLPOOL 7a01b9c4e1bb1f827f8eb7006c6616dcbbc96e18e85cfa59492890b12f31e56b9e481f67a3d2344b5cf2a6e6599847706892cf97da2bca4ca0790439b7c1b10b
-EBUILD nvidia-drivers-331.113.ebuild 13178 SHA256 1610b0ba59132c8813935f63da4741b527f31cdc306fd14d7d56c4aa25e34670 SHA512 efb19805b682e65ac6464fbc81f4630b634134523dcf20898ab01dacb157582ccb7ff65de9efc33bf916d74e0f2886aa9657a74437a700098d728dafc9fb0315 WHIRLPOOL d071df2525039819cd029b0c497f6c29d812339c0a144c51575ebf8bcb73c84cfda7b57b21587e537c92f979f9267aeca31887e33ddc74dbb3e45e8d06814f08
-EBUILD nvidia-drivers-340.76.ebuild 13647 SHA256 0eac9536ebc483085b9c1b4e665fdb5f24c9e65f295eac855cf1f9e525e60ba3 SHA512 ba503b1523035a6e6bf2305f28018c691e43b917855422aa8e83745ac5c4af3f69fc5124d16ffc033b804d89fd569122656dcc254b138e4cd791e5da0c82ff7e WHIRLPOOL ef3562e68ec7114dfb22b8ecb61ce7cad9c5941ef474163c130d1de975c4c2c6e7535a8d4ae83c74ac81f5bf1af6dee3b434ae0e18acf5fd45ed8f19cda8c4ce
-EBUILD nvidia-drivers-343.36.ebuild 13647 SHA256 f22ce9cd8d93d259e5860296b8e0e70bf6d9a06e58a79897208379fc0396ae17 SHA512 f739f65afba9a67e3914b50cf5ca1a8c1bec99d6ce7f94ab81d8ba4f703cd5bd4cf99a480f8b70d4a8152a06141d5c2eaa2642820d0b0845cda1210d9161d81e WHIRLPOOL 33d875b678077b9f301a34297099664d6dc7e13bb34a3cd92ea15dd03a8cfda70be20abb4727d855e93a87321c967ee760c71f3e868a69d82d1da8e8ff83c462
-EBUILD nvidia-drivers-346.35.ebuild 13960 SHA256 416ebb115c9b56c5b52cbbf4de7ea36306517cb04299c1f399975dd6c7d493b7 SHA512 16d1851e07fc2342921e28e5770b23b51cae38a97849727881af94007795d01115fbf6c64f7cf65e378fb73ee757a9efcfc5d6a9538cad2683f5696fb8130634 WHIRLPOOL 2559c0fe04697d56925e76cccdae51cec14e1d191fef236c7b2c5cc23b5b5d6bbf38b0ae2d076baec7efc8040f990148c7fdc1ad863cd85ccf06cb13844ab538
-EBUILD nvidia-drivers-96.43.23.ebuild 14868 SHA256 ba078fff7872b5534d4624ed05eae459f8b6e4d6600d86853135795c10e5f301 SHA512 1b6d419371640940f7fd3d36936ecaa886a5100f5511ad3d239d470c69c1308125581f85d88c45e7df230dce61330dcf06ebfdeedd704e5ed2ccfcc1caf9d5ca WHIRLPOOL cd0d3b0991317ecd849874cc505a3ba837189c9a145be35c5b9b6b7e9c45f57f5de8cc91869575388c10b617f2bbdfa47661b5c18f17fb8ba49d13911e22d056
-MISC ChangeLog 17591 SHA256 233ab0f7bbe7da31206dace7f145718a5b627572abfca92b85f598995e3dfa85 SHA512 6bd9d452efda079901f1caf24d076b38da10fe95555405f1776953f826454529bda0e9954bc4ce182c391b4069e10533576241dec33955174d13896b2f03399b WHIRLPOOL ff786188e96fb7619eb4d87fd89927ca5d21c0798c58181ef48c5a88249e54cf43fb5e1aa5852c5cd3ed0ec6aef59ea8c30e69135ecec7f009926f70eee421b2
+EBUILD nvidia-drivers-173.14.39.ebuild 16634 SHA256 e8a5d83c184300bcead8f4a90dedf73fcb8ee3b82b0ea9fd8eccbed795199e08 SHA512 a4c12f04800ea75587a4e0b8335ed8bd45de351c4e7311214e9ec4e6b68dfece8c51b99e9134b3ab0214d107c5d32678e1f7c8ff4823d2c0d78dd6bbb384f5e6 WHIRLPOOL 0ca39235d7d5514238cd6a5ce377660957c787a15f13851e98ee8da052fbb3ed6893565af11cea69bad95c56861e9ceacb683490321a1077d08fce3a9396e42e
+EBUILD nvidia-drivers-304.125.ebuild 12590 SHA256 0e3d585402c9fa41fba22fd705627755f07e0a8fe39a168716c50d5f21686d02 SHA512 712db6a828769cdb1cfba9275b6377841b77bed2ce3ae9aaa54d7ec2e783443d95687f6f810a4959e2f9e7745b5f59a5d49c6c01d8fd9d4314b3154edbcf439a WHIRLPOOL 8f62725604267f8fbcc1ca98ef9aec9374602565918425cf6b4d09d4819fc865a04fde302710b4ba381f0e79a2c8466d2175795a83df2b205d51b8e043f3dc52
+EBUILD nvidia-drivers-331.113.ebuild 13180 SHA256 298b527cc7e97d2afca504882cf582c005bb032f335f3540c0ecbfde9ff713bb SHA512 d7dbf1fcdd490d3f54b93936f1d69025d15846a4fea869bcf9afe076fd5c670d36bbf32d21d7e757bfc6c75b1c84c0bfbab03da5094b94f2f48f64dcacaa3b79 WHIRLPOOL 73280737af9fac84817cff7e2511a6cdf7793a7085103d07a91e6fe03267bdcad8e060439c4dd3c8a58189b1399b5f553eeb1cbf3d2545f23e2b666f151958f0
+EBUILD nvidia-drivers-340.76.ebuild 13649 SHA256 403aa75c50631b7e241f63ca2b16c6007ff290a2f5cfb9c9ce07f2fa7e872092 SHA512 ac4bae3ba3abf476617b8d967c272020d21dd253385debd83b3fbd92fe01f4e8f49d6b017ecda1b104dd4ccd4a6efb053d8586c110d2a4a26ea3a134b7877aed WHIRLPOOL 24fc9bd637a843ce0cee19b7016cf35c9962f8f22ea9d848473cf05dc46a1d97c0598c2014ce10012a92d1abcbd3be372e1c1d31660950aafe974881d55b37c2
+EBUILD nvidia-drivers-343.36.ebuild 13649 SHA256 3bc5803f2be86056ffa610eb28871ef0dd9ded59e08468e28f3222ab94c2b18c SHA512 36af0bcf544e955340fa0f0992b490523e296e8f95b2413b99e2ea8d6f68796cddbfbe593940f196fd54608ad6cdf4fc0111b058096040987411f4662592b54c WHIRLPOOL a619139d2143d5bde9f253d93b85b4c71df09f3f603809c3b033e11ae01314738daad836c46f5bbc0cba68d6a466890b18746d5f6574c8c07bfd02dfbc98ea26
+EBUILD nvidia-drivers-346.35.ebuild 13962 SHA256 4e30f519b673b98e0148e7110178be13970d4963db63ca4a4ee63e67806017a1 SHA512 c1ef61dcdba8f04402f484a770136146c2092200abea87393809e1882d3d7172c0b7e968c226d6b625b6ec0e23dbadfa089e487e7a1fead3f620e7f4bbcd38d9 WHIRLPOOL 0d79ffab0ad6b94e839b88f4d02a59c09def9e0d8b1d0ad2d04f435b38cc6389bfb02fa8a47d7634cccccbf0260a4c217cafe19325ea0d3ebd1bf4c7f0e1ea18
+EBUILD nvidia-drivers-346.47.ebuild 13964 SHA256 03447e0f0850be0dac5b360ddb335306e37723f1eab895dc3ede048f6b3502b6 SHA512 34ad6fc4a4b64bd9e3af9a766c6d2092bcbaa8ee7b74ec88ad247e95292b0cd50347ebcae7927d404e0c5af0103cc07230dd5ab9b0353a6b4c94c2e367c16acd WHIRLPOOL 36defb48bef5d0144b1764bd8d24e19c3561ed75ecae9679c8974c858eaf5c33631c84948069fa0c0fbb999ae613b34a62d6b8db107e59c7d52c08396cb54895
+EBUILD nvidia-drivers-96.43.23.ebuild 14900 SHA256 7790df076db54e09e90a5ea4120969709c6a39dcfa1ed35fc6d86fcc906f6f68 SHA512 f85beecfe87599bd53074ccd2e11c0cbeca7585177ac21d9300e0f1929c17f8a91990e4af1c268a2e528bc5db892eb116fdc38a57afdd034d13a719be4527eb3 WHIRLPOOL 145d0116610e0daecb8ab3c2af7dff261dd07b56f31d4f9f38a29fac64ac5f920bb75fb705007b2ed37140fcb21ea8c7f1184ef209ecdf76908b8c54e285dc22
+MISC ChangeLog 17995 SHA256 78665cbcb45cfa7d25f93697985e1afdf1fd9202dc7c6b9414f588f70bcd7f8b SHA512 05a23c24190b9230b04e41decb89ec308faeea33421dd3084a1bfd6a37615cd2c4b908534bc58c86ec2669655421de255aac33593ae54f5366c3134bb9ec749b WHIRLPOOL 9e9f5cf2b1adb388f9fb42f611b7818452f01806726476af39cca83c5176d39a7f53aca5bc1e7a989361d6b93c26321943411eb4e72a3e69c82e73de9fce1721
 MISC ChangeLog-2013 103100 SHA256 e8474a573b3e0082e71ed55094cb9298a631b76f415210e573b6db8b9a9fe6ce SHA512 706f2be5243cfe7ea2a850f8d3555d7d83d06c1341b8a8deb3ec9776970ed78fbcb2e99612dbb8205e4f553fcc564c187309d1b9013aecddbdc0cb9dc29cdb00 WHIRLPOOL ca71c3c53156cd722c6cdc2117358cdbb6cba8209bda6b3cbc59e4e84fbd9c4e278f108c06e80057a5af1a40993f24eb9cba542dd5e9518506f9ae6766fa56ba
 MISC metadata.xml 739 SHA256 f455845cee6b0247e229d7635f300565411d8e5f7462c8833a4ecad2a4ddf343 SHA512 f1a87a421415e988f96a597247eefd24285bb9709b81ff446e2056bf9ea99c170216c92b43605cdd0e238697989031bc72f8aa104231b1e36fc2338677312bda WHIRLPOOL 95199a2e4e10954ce93daddb0802e608fb4425ae73e57cea61882960ec4916b556b7ef7a87b315a2c6687e98c603e049003948f7388a9a8f8cf8714a16ba6734
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTYY2EACgkQVWmRsqeSphMxdACeOpxaxa4N+W6O9FlJB9x7d1vL
-uiEAn092lIEDRc4QktnlMZ8Rl/XmDssY
-=VDTP
+iEYEAREIAAYFAlT23EAACgkQVWmRsqeSphMH4QCfS3WctPH+PrApA6hiSOxAIK/F
+makAmwRP1X9N8UnwJD8Xi+0GxTtcftL7
+=X3c5
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
index 4bfece49ac3a..42e4806f4375 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild,v 1.7 2014/11/29 13:44:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39.ebuild,v 1.8 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 
@@ -47,7 +47,7 @@ RDEPEND="
 	)
 	tools? (
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
index bc13b283b33b..1aea7040e42c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild,v 1.4 2015/02/09 07:35:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-304.125.ebuild,v 1.5 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
@@ -42,7 +42,7 @@ RDEPEND="${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? (
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
index 31ab2e868261..6c5acaf95e1c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.113.ebuild,v 1.4 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 
@@ -46,7 +46,7 @@ RDEPEND="
 	acpi? ( sys-power/acpid )
 	tools? (
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
index fa7e784f3be3..07a4ded22d7b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-340.76.ebuild,v 1.4 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 
@@ -46,7 +46,7 @@ RDEPEND="
 	acpi? ( sys-power/acpid )
 	tools? (
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2.4:2
 		x11-libs/libX11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
index d49c336482a8..f3172a98df7e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild,v 1.3 2015/02/09 07:35:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-343.36.ebuild,v 1.4 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 
@@ -46,7 +46,7 @@ RDEPEND="
 	acpi? ( sys-power/acpid )
 	tools? (
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2.4:2
 		x11-libs/libX11
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
index 79bb00ae166f..2369a5bf6c0d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild,v 1.4 2015/02/09 07:35:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.35.ebuild,v 1.5 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 
@@ -50,7 +50,7 @@ RDEPEND="
 	acpi? ( sys-power/acpid )
 	tools? (
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		gtk2? ( >=x11-libs/gtk+-2.4:2 )
 		gtk3? ( x11-libs/gtk+:3 )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.47.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.47.ebuild
new file mode 100644
index 000000000000..38b0c69d7c1c
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.47.ebuild
@@ -0,0 +1,496 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-346.47.ebuild,v 1.1 2015/03/04 10:19:40 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-admin/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			|| (
+				 (
+					>=x11-libs/libX11-1.6.2[abi_x86_32]
+					>=x11-libs/libXext-1.3.2[abi_x86_32]
+				 )
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 3 18 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-3.18"
+		ewarn "<sys-kernel/vanilla-sources-3.18"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		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_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_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
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
index e19e9484b529..a8dd615b28cc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.23 2014/11/29 13:44:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.23.ebuild,v 1.24 2015/03/04 10:19:40 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability unpacker user versionator
@@ -23,10 +23,19 @@ RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
 COMMON="
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	>=app-admin/eselect-opengl-1.0.9
+"
+DEPEND="${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="${COMMON}
+	<x11-base/xorg-server-1.12.99:=
+	acpi? ( sys-power/acpid )
 	gtk? (
 		!media-video/nvidia-settings
 		dev-libs/atk
-		dev-libs/glib
+		dev-libs/glib:2
 		x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2
 		x11-libs/libX11
@@ -34,15 +43,6 @@ COMMON="
 		x11-libs/pango[X]
 		x11-libs/pangox-compat
 	)
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	>=app-admin/eselect-opengl-1.0.9
-"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="${COMMON}
-	<x11-base/xorg-server-1.12.99:=
-	acpi? ( sys-power/acpid )
 	multilib? (
 		|| (
 			(
@@ -54,7 +54,8 @@ RDEPEND="${COMMON}
 	)
 "
 
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+QA_TEXTRELS_x86="
+	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
@@ -62,28 +63,36 @@ QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}"
+	usr/lib/libXvMCNVIDIA.so.${PV}
+"
 
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+QA_TEXTRELS_x86_fbsd="
+	boot/modules/nvidia.ko
 	usr/lib/opengl/nvidia/lib/libGL.so.1
 	usr/lib/opengl/nvidia/lib/libGLcore.so.1
 	usr/lib/libnvidia-cfg.so.1
 	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
+	usr/lib/xorg/modules/drivers/nvidia_drv.so
+"
 
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+QA_TEXTRELS_amd64="
+	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}"
+	usr/lib32/libvdpau_nvidia.so.${PV}
+"
 
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+QA_EXECSTACK_x86="
+	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
+	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
+"
 
-QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+QA_EXECSTACK_amd64="
+	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/libnvcompiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
@@ -96,22 +105,30 @@ QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-settings
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+"
 
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+QA_WX_LOAD_x86="
+	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a"
+	usr/lib/libXvMCNVIDIA.a
+"
 
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+QA_WX_LOAD_amd64="
+	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
+	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+"
 
-QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
+QA_SONAME_amd64="
+	usr/lib64/libnvcompiler.so.${PV}
+"
 
-QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
+QA_FLAGS_IGNORED_amd64="
+	usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
@@ -127,9 +144,11 @@ QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib64/libvdpau_nvidia.so.${PV}
 	usr/bin/nvidia-settings
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+"
 
-QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
+QA_FLAGS_IGNORED_x86="
+	usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -140,7 +159,8 @@ QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
 	usr/bin/nvidia-settings
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+"
 
 S="${WORKDIR}/"