media-video/nvidia-settings: Drop old; synchronize with drivers

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

11 files changed, 35 insertions, 594 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 70986e033b1d..233cad2ff229 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.133 2013/12/24 12:49:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.134 2013/12/24 14:38:28 jlec Exp $
+
+*nvidia-settings-304.117 (24 Dec 2013)
+*nvidia-settings-304.116 (24 Dec 2013)
+
+  24 Dec 2013; Justin Lecher <jlec@gentoo.org>
+  -nvidia-settings-173.14.37.ebuild, -nvidia-settings-304.60.ebuild,
+  +nvidia-settings-304.116.ebuild, +nvidia-settings-304.117.ebuild,
+  -nvidia-settings-313.26.ebuild, -nvidia-settings-319.12.ebuild,
+  -nvidia-settings-319.23.ebuild, -nvidia-settings-319.32.ebuild,
+  -nvidia-settings-319.60.ebuild, -nvidia-settings-325.15.ebuild,
+  -nvidia-settings-331.17.ebuild:
+  Drop old; synchronize with drivers
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> nvidia-settings-331.20.ebuild:
   Stable for x86, wrt bug #490684
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 5e5cd428548b..eb7797b4be8d 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,44 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX nvidia-settings-173.14.31-Makefile.patch 3138 SHA256 05ed03a0fce667a9245dfa31953d37779f32874cbbe6089c2417a997cdc3f2f9 SHA512 e6d6717f602d3a040ae25cb48051a0877c4adb46632db2225461b471a8900c224d43f95359ff6518068acc412111564b7ab3a21e871dd65e463807173805d976 WHIRLPOOL da4e036304b42d45ea6a9597f33739b01641ea45b3d5f5eba19e368bc69c759361eefaca55e8fc9cf5292fbd68bbf1fe5725c78293b7340f6d8be90b080a3e95
 AUX nvidia-settings-319.12-jansson.patch 2661 SHA256 88032d99bbe40630a7f202be5a4b0dd1274ef483a2dc152526219af2bf29e0b8 SHA512 c510f88fc5646a7dd03f480d8df812d679cbb6fd114e1e8451f8e3e29b3ec1ee11902541bd7fce12799b035898b793f7dca567f5b762f1f20d786a8e5e83a444 WHIRLPOOL c161e1d045820af31e340d4969b04e51abacab2bfda6dc89f9939e21dac726803f1e6644ff173b9e20e4695866faa1953360dca4e40dc13318eaace4c40b2047
-DIST nvidia-settings-173.14.37.tar.gz 1301471 SHA256 3ceddb71c49668f632d94951c8c15d8a73081da7e2b5bd4031150ab5fb8995d4 SHA512 9f330035fb5d16d10f2ce22231ac01833372399edbe42aff24e0e330a02ce1a1bdfd720014391259076247c3c8e29660b5991e70f009438e43bade73350b5258 WHIRLPOOL c0309b752df137cd5cec8030d8e8f9b94100bb2d53d18e064bf87e1c9c6d760716aaf5fed4b3aa4d2b5fa58dff389a65d165d67db143c7b88dbe13168862310e
-DIST nvidia-settings-304.60.tar.bz2 1479772 SHA256 96f0f984d2d4e37c3e492476c3506283f5666d952ae94ddc79d7e16b047a9b36 SHA512 7b55621b97c39f3905d6368151c344a3914b0855951f92b4ff479ba94e92fca715505692d8ad72b9dca33b93eb45d5e3342b569c898d837053686ebce71b14bc WHIRLPOOL 9c63088ec558d55469764422ef26e2697663b3d4bfb9c075b17c4c90ec90b5fee9ff42fbc711c7f1e22a102f2bf1e3ec696923531b54ac374283318594f89ff5
-DIST nvidia-settings-313.26.tar.bz2 1495122 SHA256 9adeafa716fbdc7aca22dde75adcb658fefd5bf09281b4f5538b87edf06596e1 SHA512 480331e52960f1f2c20e9b8763e93ee0458db6e4fe04fe9aedd8e1892267448964d586a64918d9a6ccdbcb703aafa77004cf0f4769f2800a6c798e893a47bb47 WHIRLPOOL 017d1cff568911c3342d26150d7e206a1c631bebcc1162150d8c10427305c366a973bb3171c1460c7c84cb023cb5299a5f507dbd29d03ccfcfa56c55c421be67
-DIST nvidia-settings-319.12.tar.bz2 1534827 SHA256 90d6971d5bd6c45280e12cbf44a4b667b91ff889b0e79f41e565f5977dedc8bc SHA512 423c58ff51f3802cddc4e470105595e262825aae68e6f0f7745bf5bdbdbb7b931d4cc56052f71e78196cd7ff633099913ddb1756dc75d5fe2b4bee21fe9dd274 WHIRLPOOL a39a2d27667cfa8cb72b8340db88e7025bd9c09676a7879b8dec3f5243a537d554ab77fe86d426f63f4f770af4c172ded33fd4f6690471f1c39a323409936a2f
-DIST nvidia-settings-319.23.tar.bz2 1535627 SHA256 8729538a6857143229ab064b320570fe71550aa9fcb89307636dfd61e4bd17d6 SHA512 6131562e6735a7fb054254bc8d8538b63ac65a7e3cca253408341a06783ddf05c593ec5897f671e1714b2777cf5af4a4eb4a33413c1f46f818424aefa6df6fce WHIRLPOOL 2abdc561198b4599943cce252365f3512e70a5e65dfb570f97eb2581393bfcdb4fa5a73e57592c895f314409daf1386563ee21b6476a4a7b79b63b3d2c79fe03
-DIST nvidia-settings-319.32.tar.bz2 1536552 SHA256 bc29e5b1b92a3ffe42c93e1cb8830131f5c948f9516d4d1b05d2615b99bf3494 SHA512 7ee585959c60da871b088e36e77bc18faab2f240b7c4eb040a0a281f0bf80f4a5cbce4af66feaaa3089798cd794e7fcd7dad7c3a3bd0b0e931fbff961392f007 WHIRLPOOL 6ea41af999ea4f78a52236e4c063023740cd7d21c7c07df21a251390c60943ad8269c4c745e070ae9f702f9429c43d5591c04adac3a7830177d791d67c7af9f5
-DIST nvidia-settings-319.60.tar.bz2 1538036 SHA256 7391d0f2518f80de0e4531004251a7c042169f89b608814a3fe7831065be9fd5 SHA512 3fe764bad08a2b00bfc99b74f248f5d12cb32cb964694c2c0416a710695dbdf1f3432e16996d40d3a3c77a5b489af59a0f1cf07dd6f537f4d551cc4b87c3571a WHIRLPOOL 2b2e5d97a4f92684c184061885fca1a9af9a211a1c02d1d482f94a66eebfa15e014bc2719e73f060ccabe6fb6ac2826ea757d98efcdf988f33f02379e4b91cd4
-DIST nvidia-settings-325.15.tar.bz2 1541319 SHA256 e7dabddf1240bcbe2990a470defba480d619cd97fa1c0ef4e28653c689be0b03 SHA512 ccb5808fcd2d34cb7fb6cdb2e081bbebb3ced5d53c296cabac76685e6612faffc20609a6e4cdbd4170a3a72b3487f8520df799342004914a42b8dfb69d8d5fc0 WHIRLPOOL 8ad4be1357358c0e7ac6cdf4247f216ac7598f804ec74285a3fe02f51a41cc35742d043dc56feee82bb2099e598a1a13eb2d1a7bab8c72e922aee495b017f34e
-DIST nvidia-settings-331.17.tar.bz2 1545118 SHA256 848387ea728668fbbed8e22e8c12ccdf5be027e6b204c813df064ee5d5ffee8f SHA512 2ba101627f18b59f7931e3be9fed8167241c10abd2c82c467d619be7ad535c376d0cc37a7b55b446f5e3b0d978b47c3e9e04f51fb30bb243f62c9eb860999097 WHIRLPOOL 51ac0ec1177f9cb4ecaedf6de4ac87c1fba56857ac12770d54ea3fd8370edef40a47da9e57b0ed4af7b05acba0d1cf38daaffbc31dd6bee0d0d8de9ec8aaa0ee
+DIST nvidia-settings-304.116.tar.bz2 1480811 SHA256 72062f0e003e699e1317a01395bce351ccb54620736d667fc40d7d018ba44fc7 SHA512 9b61196038a5b88bee8319b74671b70837aa1514233be225c6b993a88b7cbfd04b7d1f53d505e29cb1e84792f1fbe6308da1969c59a1729ef8b2ee6a9f452187 WHIRLPOOL 8a81c78c91a442aa31425d520240ed2686b8727b1a42fb9427c7c6ee4c63c804499a7e79d396c5c21209cdf867bc0bdc54d501f72885f77031ca1f092a7a72bc
+DIST nvidia-settings-304.117.tar.bz2 1480666 SHA256 3cec3ba1d10695d178b5a58cd9eadeb457441ef45aaa0d1bf7af60082c67d37e SHA512 7f1709788c25dd49f29d52478844406f86184563844e313cda067c6b499b8510797a7a37dd359877a029f4917bf9b9dddbdfcbbb258989c6396fd498fc07379e WHIRLPOOL 499568d2c714e15f0a25f22d7f49adb14ce82bf7cb27ecb8705a8e84beafa967b4f6b2c8932bdf2c62e3ded76a8a84b24a8eee9da47897fd80f7e1445ee8d7eb
 DIST nvidia-settings-331.20.tar.bz2 1544551 SHA256 229ead42dfc43627797bd0317ac3320aeaf97426a975325986aa91d28fa7a7f0 SHA512 e2a4f4171a6b989ddd89ec606d7a9de20ada84116e004e8febf6feec683ecf5f2a02d47505336ca6224bcb235b9aa38053e8998ea02e15ee6ee930e518e197e6 WHIRLPOOL c3d4e73cb9892ecb49d1d802b9178d4636a02bc2eace93ec202041c6c798d74199ab565608e7fc99f4be122843dcd4532397ab0b53059818daf1ae78922c925f
-EBUILD nvidia-settings-173.14.37.ebuild 1669 SHA256 7c0e524a0ccf767356b8db795d092e37e1b7297012a8f9f7f5820b2c8224ce8d SHA512 e675540eb2a2f43738791b98f6f6e0f8e5c51fb51b0ba0bc33bb31ccec448390163c57c786705090e9289c7296c38823cdb5d8ed60a6ab4a66387e4307c1beac WHIRLPOOL b697f51f4905b285f4f30835b466901ce85c7a78c75992bcb8aded2df0d3c5145ad397e337a3aabffb74026efbafd37e71b43341742d774cf02c8484c89a4abb
-EBUILD nvidia-settings-304.60.ebuild 1660 SHA256 26e18f55bc00c1a15b459aed7c3ada7eac32230cd04a66670078c7f49322e830 SHA512 25fbff15fe55939ea4bfd32cb23f8ff40e5e7472e3b9ec3db2190059f9a3665e723326a2a76858286aa3d4a981e58835b27b90777d273c698e5f90072d436e25 WHIRLPOOL e44b3d271f288e9a76713783b72e6c22f0fe5d9d2d11ea201a061ba20efdbd99c0e848457d30b0ad998e30235f6f9c238efec0b5b08de5a214281f86d3fa0edd
-EBUILD nvidia-settings-313.26.ebuild 1664 SHA256 5c5ce765f9185c7968224e2d33f05431048bbe6d6a2d962249ac215a27964f04 SHA512 0c1a428d766bc1d6cc16babf2ec145e7399ec43696f96038fa277f88b7e19a7f23f2357ecf869cc6760a17b520c267b675ec73e1e3457aa61016bb1af7b21604 WHIRLPOOL 56f0565e26b0863b6f1059a54174fd95e3e69db0b62a4e45224345b8bcb107497baf494b4d5c18ce82426f487867d671a4b65076366ae056a9c4a05238162a37
-EBUILD nvidia-settings-319.12.ebuild 1860 SHA256 a815aee95246531b384b72541b1fc3c2f03fb6ddb18eed3fe742f10ca9188bf1 SHA512 52c2e3c98b6808e1cd492392359c3600477a9af180366eefb10f827048ac999273dbeff1ba9678fb256e02c736fd36bdb1a2f10804a3a524c355c22060fcd461 WHIRLPOOL afb7c30335bff28283173f26d6f1e67bff0797e133ad99fabe455a8caaa68c44a740cad9aca1dd7883886e2f81dbdf1c1ba997258b35307c5bd90f90e826ade3
-EBUILD nvidia-settings-319.23.ebuild 1867 SHA256 28721e6709e729dbb68802d6aad38fa47504b4817664c05b581f3a1b49db5866 SHA512 35e112af482ff02e91aca5f5e7da96d25f3ad0120c9048995ad8cb973b21494a6eb86694fd664e02c05275a0bf4a74738378bcc2b830751dc73360759042c281 WHIRLPOOL 5b1f59f8737e830e06469c0d41c12fad4534d5fdb65680b3c162eb167cca6c9115576d708d15c1da9cf3ab0dff567b551383d1e7dea368ae506d78c55e62f7f1
-EBUILD nvidia-settings-319.32.ebuild 1867 SHA256 2c588ffabe8c9cddeb17acf42ce1b22189b90e2f44c73b5e300a551fe5da9e1c SHA512 42fb9891f5de6bfebb38c3490fa496311ed7cb287ebe5efeae47fe8dca59c872c8803e065d8cae268e46a372c41c722f785a524044af47eea972e843d6a1d142 WHIRLPOOL e2a0b847fbc581de0088930e4817b2f7edf141e035f994fbe51b6bf2c621095a4e04378a46446e40606ca9bd3a78913d3650614933c6eba1cebb63f77fa43f4a
-EBUILD nvidia-settings-319.60.ebuild 1867 SHA256 2161412260a27f9f69b671bfe1848e2e2380ab13f530dfc841187b7947096f19 SHA512 6514eb9f314c70099e01dd780f8a7f4bf0bff2470fbc6881b3a14b8e270e78b2882864924580669bf8e54d9e4c948693a5d653f87c00c7b61f37e3c434f37eac WHIRLPOOL 1e63878a4331d6a54f9a48b32239d43b8c49f1ef71a0fc01d89f41f760377d1f0dbcf1c47b01d2516145e35d9d38fc35351b52e7f955e823a7fbac9a086e23ae
-EBUILD nvidia-settings-325.15.ebuild 1868 SHA256 2d5fe21ea5a8d7c81b126516bdea3f4c4b5e1f68b246125625676a83c7c973e8 SHA512 72648d85ab866df7f611652728529c6fd92152c2003e3efaa2dd07b1b54b4574caf273c7066533d7ae1eea78596625cd77287e94ef9f7cf5b8be491498eb9c6b WHIRLPOOL 566ffe0e1eac37d06597c664f05c6273a2eb1935545b178ed8f605ccd4e26097b0f9c0041dc836878adb019447d0922dcfc0b0d9f46fe453b1816f132bc459bb
-EBUILD nvidia-settings-331.17.ebuild 1867 SHA256 2d5650f5d6a8b0fffb1d6898f46e7044001c80045fcc06478a13ef72fbc5bc2f SHA512 036176c9ee455debe0875c7d5515fcec83c07a3ec0fdcc7012a956fa330a3e51cbb188f7544319c5a408df84fd742180e44750be81445dcbb8ac7b90aef7c2da WHIRLPOOL 40ee2677073223bc31b43add40e0e02256cb2284264ac2af348ae37ce50e198ed0e8007e4e4c229dfc56a2d92e1b1cfd760474323f63fed474d12375aaccda5b
+EBUILD nvidia-settings-304.116.ebuild 1664 SHA256 75561ae597e2f0e4f26126a4eaa5d02c423857c76c058137906241d767b25e40 SHA512 a9c022e99080adbf8969aaa45791a0dd3d8d5ebddcbc2270c7b0a87e61ab98b674eed8872ad9467847efda171e4d30d88484ec3020c8c382bfd69a94d75cd665 WHIRLPOOL c3ed9fb32acb7ad594dbd19f9b5c444f73eddec1b03889e6bb9b8fa2d835920037b91d2c41b3017f7a46699bc674f30833d8ee4cb5d613e11c85dac15de40ba9
+EBUILD nvidia-settings-304.117.ebuild 1664 SHA256 5020ab3608ca1c9e7dd1512d33ff95dfab3c39534cc045f1bc0e67bccaf5cc7f SHA512 9e7d2b7f863aaea8d0199918929a62b9c0d6b538de93330f36e988af94c12f52a092dd4c75d0442eb451cff3001da50c644bd097a086eadb380cdd425258a12a WHIRLPOOL 6d4c3cf3a64e05ae2279b5c15a9b551338d6dab3602d828724deb26b681342532214251cfc969cb2daf704d5a7c98f2b6f1ca30e9c24d0dd7c4f27e54d2f0139
 EBUILD nvidia-settings-331.20.ebuild 1864 SHA256 79b5bd00da4765965d043e4aedf370097a7e10364ef8dcb6c0babd61b5084877 SHA512 eecd987054da2ea85e11211b2d98d1f95018d806f2b7921464b69f6902ada561953582bc2fcbbcddcb5272b738a55139911838bc8483c0af2b4959824a92219e WHIRLPOOL ccb6ec50d0594fb7dc6d2249e180fc80f3f8e8d0467de243611e7f757c821daaba192f2f74529cdf0f7b80877ded2a68f2a1c50c8bbe6cc32e06f629764c9984
-MISC ChangeLog 26523 SHA256 64c811878f29943a8a5e2f3ffaec8f8d3bf7cc524596e355fcede467f1f8a288 SHA512 c62e3c8577e8fd5e4cfeff61440dc4d1c2de28282fec4807e51ce1c0a6eaf98af2c6a5bcea60b81914b5ab72aa8993323b956943218fb7d8338b0cceb9b98a82 WHIRLPOOL 03ec2c289993174205a4ccc254075696deda224fd612a9e17449ddc9ba5a66d25d76266d4f7ad597607e878c15bfc01af085798ab3b8b399c5ab51a2bb67821d
+MISC ChangeLog 27057 SHA256 89172d0aa77f6bd51a25dec2b52b629d456ce17217bb51a5c25ac7f8294ffe22 SHA512 c9d66a328c00a571dd2d002cf52bb498e6deb50d90b52e5dce99f5c2b819eb344b210ad124afbcadd218eea0c163fc5d901f0e103ee4667950356e207862eeb9 WHIRLPOOL 06f1392802ce5987e55b95d39378f68f5b7ea9e4853ee524ecdcf61e40eeedb425c0d31434bb6ede178b72e4be090796e2ac08826c0b57847b23529a16007438
 MISC metadata.xml 338 SHA256 72d972e91be939b89a9dbb0c2e94701ab0e554c5006cad3c729fd5d82e1480ce SHA512 ee86e142648786b6a665343cd294052afcb7ac60adfa74451af86f0248206a648d89909a7556bed79494ac0fd1e0e4d83d4e8511010d9ce4433b3980f5f28399 WHIRLPOOL f668faaee22236e4971813bcfff9ab92b7fab87d768f071cbaea9a9136b43aed7070e08073e7c4e705e1158de28905d52c44f71d867878a85a948218a18d1800
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSuYLkAAoJELp701BxlEWf/Q8P/jyIOYpibKHYhdakV0lJBqwf
-yWTp18hAUqMeYa52xxbkjhArl6lbUYD0h4M9LQGIPZXeTNkxuZABosCnpxuwzHlO
-ray44Nn1jvYv0r/TtITdyl4ELyutHCH9yc2RxEnkNl/u0NipUgFgPJfY1C7ZKIUv
-2ejfzcJ45yPNq1hgcW9wYWnlUkBu6b4epjJg2V1aOcbAXbLXEF0767rebN1WZCfG
-6DF0SVClEDhXMKMKmDoCR8BaSl4tmGY+H8rVnHk+Foxs5Hnf6LrBiCDEA8uvQ+wc
-fFFua/+1YuDlgXDqa893GSjIKMNep7Rf5FcEgQ0QnSHlCki9kylDcTr4FchyBm6q
-ypT1GXXvkvTmiTCADy8GXaZnzulP46mWN5bIaq8wOGx1sZDblgMcVXTQQbBQ7aRo
-1tf5gOFhYQLY+iEkEonFFnXc2OnvnnZglBf5ZTfBtmnG7rY6imrp4Av9vR+GsRYQ
-7DookkQvbAUPSxTBjtSAmIXmW2cnyyaI41LI8dhyKHulFFkowi+64GOLM6vnmFXm
-WQyhCikmI6IapjfYXb+JV2Bd65u9f1QB1Q9Z0ro7qTY5XjlcbI+DpUgULNIQEsph
-M0hAx+gWGqi8yCghwmrmrQ/lb39ukCDJ4bpMLcru1tqWhGbBPkTZJcgHzdhggnCe
-A3vY5l7h6Mei1D7+WrbE
-=rQBZ
+iQIcBAEBCgAGBQJSuZxlAAoJELnU8jG9FVirqoIP/i2cQ4sanChVxyehV3RxChEL
+MlnoSQf4pRj/hsmabu0Lh6Cp1eNRB32DKeq9hzqRAGTJVvXCZUdh8elmec3v7O9N
+5JhrEKsPI5CMWJorr8BqlldkM5G08KpZWRsh6AuKbxmluDi16+FefFFHC/YYCYZP
+4Bf73EVX4pJec5Hz/+HwQJgN7PsRmE2BQzmA2WgIKCURkK/oMYmkeQEjc4RcoBW4
+6CfeLcjO5pcYrUeOpvE9mwSCvnJioTtUu7eRE2SfooL+u51Ikdmv08L5DoPy7uL+
+f6vl8NlxGecKxPNMrLUcne4hXFB7uC+0teeEI1TWzqfSHCnS085GTAkULnw3hqKV
+ej6vFBd2mpUN8UpqTZu84gXoQJeNamafIq5aUOLaDUFlv5csTziT2rgErPJIlS9F
+bki12xpyR0Sb4zPQyJ2dhvMNSu+PuIJV0SiPTdklv8Z5D3k34MRA7ZV24QTAisve
+DzOlSKIrLY9aeTkCyM8pUacj7PjX64W1yDVDqeq3fqI+YeMB5hy/O4d6sSfsDfRT
+QNRyq/R9/PlKQHtr20sLNbBxGuUe1eCvdy1B8ZvnTrmi0zsK7n5x/olhJLh2RWXv
+tVVdL0yD7lTEfyprcWwwSi5H/soO2vN/AbZWfc5EhHhRNG9wHTDLfl13j7qMSuWN
+bu0ZndlwrH8VqmQ7Bm2B
+=dWhx
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild
deleted file mode 100644
index 103c8abb282c..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-173.14.37.ebuild,v 1.1 2013/04/20 20:43:55 idl0r Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${PN}-1.0"
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm[static-libs]
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="=x11-drivers/nvidia-drivers-173.14*[-tools]
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-173.14.31-Makefile.patch"
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake  LOCAL_CFLAGS="" CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	emake prefix="${D}/usr" STRIP="$(type -P true)" install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-313.26.ebuild b/media-video/nvidia-settings/nvidia-settings-304.116.ebuild
index c4d9c79e1be2..ee1dc44cff6a 100644
--- a/media-video/nvidia-settings/nvidia-settings-313.26.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-304.116.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-313.26.ebuild,v 1.1 2013/03/28 22:29:59 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-304.116.ebuild,v 1.1 2013/12/24 14:38:28 jlec Exp $
 
 EAPI=4
 
diff --git a/media-video/nvidia-settings/nvidia-settings-304.60.ebuild b/media-video/nvidia-settings/nvidia-settings-304.117.ebuild
index 457d8a9568dd..cb5bd4c55e59 100644
--- a/media-video/nvidia-settings/nvidia-settings-304.60.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-304.117.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-304.60.ebuild,v 1.3 2013/04/15 08:50:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-304.117.ebuild,v 1.1 2013/12/24 14:38:28 jlec Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 IUSE="examples"
 
 COMMON_DEPEND="x11-libs/libX11
diff --git a/media-video/nvidia-settings/nvidia-settings-319.12.ebuild b/media-video/nvidia-settings/nvidia-settings-319.12.ebuild
deleted file mode 100644
index 7bdceea9d815..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-319.12.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-319.12.ebuild,v 1.1 2013/04/20 20:43:55 idl0r Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-jansson.patch"
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-319.23.ebuild b/media-video/nvidia-settings/nvidia-settings-319.23.ebuild
deleted file mode 100644
index 4a580409d13f..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-319.23.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-319.23.ebuild,v 1.1 2013/06/22 11:33:47 jlec Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-319.12-jansson.patch
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-319.32.ebuild b/media-video/nvidia-settings/nvidia-settings-319.32.ebuild
deleted file mode 100644
index bde886ba8cf4..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-319.32.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-319.32.ebuild,v 1.1 2013/06/30 10:38:08 jlec Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-319.12-jansson.patch
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-319.60.ebuild b/media-video/nvidia-settings/nvidia-settings-319.60.ebuild
deleted file mode 100644
index 396b0820d5a3..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-319.60.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-319.60.ebuild,v 1.1 2013/10/29 07:18:28 jlec Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-319.12-jansson.patch
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-325.15.ebuild b/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
deleted file mode 100644
index 346d16259f20..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-325.15.ebuild,v 1.2 2013/11/28 11:16:52 nimiux Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-319.12-jansson.patch
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-331.17.ebuild b/media-video/nvidia-settings/nvidia-settings-331.17.ebuild
deleted file mode 100644
index 9faaf10c9fd4..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-331.17.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-331.17.ebuild,v 1.1 2013/10/29 07:18:28 jlec Exp $
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2
-	dev-libs/jansson"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}
-	x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-319.12-jansson.patch
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}