Version bump, cleanup and install nvidia-settings again, bug 404335

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

10 files changed, 117 insertions, 398 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index dcbae21ecec5..67ba0a8d870a 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.107 2012/02/21 21:38:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.108 2012/04/18 18:42:27 idl0r Exp $
+
+*nvidia-settings-295.40 (18 Apr 2012)
+
+  18 Apr 2012; Christian Ruppert <idl0r@gentoo.org>
+  -nvidia-settings-173.14.25.ebuild, -nvidia-settings-173.14.27.ebuild,
+  -nvidia-settings-275.09.07.ebuild, nvidia-settings-275.43.ebuild,
+  nvidia-settings-290.10.ebuild, nvidia-settings-295.20.ebuild,
+  +nvidia-settings-295.40.ebuild,
+  -files/nvidia-settings-169.04-no-display.patch,
+  -files/nvidia-settings-190.42-xf86vidmodeproto.patch:
+  Version bump, cleanup and install nvidia-settings again, bug 404335
 
   21 Feb 2012; Christian Ruppert <idl0r@gentoo.org>
   nvidia-settings-275.09.07.ebuild, nvidia-settings-275.43.ebuild,
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index d6fbfcc7c50d..e8ab9d1ed517 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -5,43 +5,37 @@ AUX 0001-Makefile-improvements.patch 5269 RMD160 c80118b3aa18f3f1d90f7aff0974b7f
 AUX 0002-Build-libNVCtrl-with-PIC.patch 578 RMD160 168a9b38d1c743798eb0e2b7e8de2efd60cf7c32 SHA1 49d6d4847621034de6624d388f71703abc6e42a4 SHA256 1492edfdbfd682b16e5f26be41bc61ab7320478c37f92730ff2b1ef1c520ceb2
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
-AUX nvidia-settings-169.04-no-display.patch 3365 RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 SHA1 8474ba73681e393b26155d7bd1b7041d66733cf9 SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7
-AUX nvidia-settings-190.42-xf86vidmodeproto.patch 459 RMD160 92de8111fbaa05d72aa361f4f03b4e5d6614dce0 SHA1 fb62377feb1e2bf3dee9eb4156cfc67eaae58e1a SHA256 ceda295eb10c446edb9240480cb69bcf595682dcf084357723d1108818db8dad
 AUX nvidia-settings-190.53-xf86vidmodeproto.patch 459 RMD160 92de8111fbaa05d72aa361f4f03b4e5d6614dce0 SHA1 fb62377feb1e2bf3dee9eb4156cfc67eaae58e1a SHA256 ceda295eb10c446edb9240480cb69bcf595682dcf084357723d1108818db8dad
-DIST nvidia-settings-173.14.25.tar.gz 1301545 RMD160 290c6cb43d2cf53676d720abca374942d86c3e14 SHA1 d7c28ad7e7481e67375d83e65d9ac60176446ea2 SHA256 a2f5ce5496dc7623c2d5cca9b14c7eb6572280445db3ec1eb92b0e7d6cf2d6b9
-DIST nvidia-settings-173.14.27.tar.gz 1301537 RMD160 3eec937a7602d66337d4067a515b840cd06ecc81 SHA1 516250f4492a7b485fdbd35088ce68442191d3fa SHA256 9a358779860c8f8238b9f436dc34a39c0b79ffd91da0f4a368adfddfee452d21
 DIST nvidia-settings-173.14.30.tar.gz 1301602 RMD160 ca2644ddbf39ebbc7027cd2554dcbd6abc5cb797 SHA1 1540ff9d055f7930ae6779f96bc38ae5ee85a58d SHA256 22777902e8e20ed615da6891cae4c229824fc02e45d22da14caff937b6fc13e6
 DIST nvidia-settings-185.18.36.tar.gz 1350273 RMD160 efa62942db7356744bb7abc67656da7f5b34e572 SHA1 895d8bd51c1da50f5a8a6d151f2f9e3711ec59aa SHA256 399dfd5ccd84ca008a798f6ec3b65e1ad4254e40490ff60fa77bce4e14ad47c3
 DIST nvidia-settings-190.53.tar.gz 1395808 RMD160 3236462fafa3372d751769e90eaebdd4d4ce7ccd SHA1 28dae22c928d15d060b3666013d6a4efdcd94038 SHA256 5ecc270e6b9257018de830c0cf13bd8ea89519024f9125fd30da5eb5792aac7a
 DIST nvidia-settings-195.36.24.tar.gz 1404770 RMD160 f3ee1cf9238d0d756e51b2eea4ada2649b3625b9 SHA1 8b32edf8fe97aa56036de4fb4c4e3740031ddc79 SHA256 af22027182c6327db81e33272806ab75b3a347bbcc075a885c987d1a7691d9b4
 DIST nvidia-settings-195.36.31.tar.gz 1404726 RMD160 4a67f3a8b5c82054fdda22c39a407145a1d7fce8 SHA1 3bb1531c2d9aab3f5d141f81d27496c5b56dba09 SHA256 9e2b8d6078da595994e0577390f9e72fc4b866ff5f7131307b4570a12dda660a
 DIST nvidia-settings-260.19.29.tar.bz2 1536011 RMD160 a1fcb31d6e23a96530e6c9e9b871deaf220bfd2c SHA1 d73c5274e95cd4ede405c4e7e9d5ad02da3bdcfd SHA256 60dc2e2693ac1950301f3a3f837e5ca6470087b1509efa54c26b6bd5544974f5
-DIST nvidia-settings-275.09.07.tar.bz2 1543808 RMD160 114c85e5ae3f4dcd3abae89381ca9429f35d47fb SHA1 d8ead4eb6ff57c18ddbbb6d9e02991d2ef9a5d80 SHA256 958bb21a9d76a5297cee322679e0b6368c7cd65536f77ae90cc0ad4c9733deb7
 DIST nvidia-settings-275.43.tar.bz2 1542739 RMD160 759a7891e101e269e1592638c2060293fb9e39e5 SHA1 d89c4c0d409d6ebd3ef043c86a1445abf75d1a90 SHA256 32018f8bb6431264ffe07eeb7f05ac0967cdfe09827a93f85c32b8e6c458b739
 DIST nvidia-settings-290.10.tar.bz2 1544400 RMD160 d114a1441dac0b178922ac3b7736e32af1d55f94 SHA1 92acce8ed9816b55edc5a8ffc3090c258ce58f38 SHA256 c20dac225e5c67135d0d3f784ee058ce6337687a4232e20335997061f1ec5e26
 DIST nvidia-settings-295.20.tar.bz2 1545451 RMD160 d9de1231cf7e48f0c285ec0a30b8a78a0a1d58da SHA1 621095bcbd7cd5f75d22488d4f750993172845f5 SHA256 92a8f32d20bdf62c0d7c71b176ff4e5d8ad848492d5411aadef4cee0a2d45595
-EBUILD nvidia-settings-173.14.25.ebuild 1928 RMD160 9dec24d603a6042142ba5669169eb7023d24e292 SHA1 d3aea444ee654be0c03a6a341bdcf7c1ded82d5a SHA256 7384d8bd6bd69d8e02db120f64312407339a2ff9799bba3c3240e9eb63d45633
-EBUILD nvidia-settings-173.14.27.ebuild 1928 RMD160 52ca73f7d5c0664596fbc3a263be037a9488bc72 SHA1 7829113bc78d88cf777bccc4d4dc3e16a1dde8ee SHA256 bacd77fa4d994574fb594e5cf1a8376e0a80b3d8e0c988425f3905d15d5533a0
+DIST nvidia-settings-295.40.tar.bz2 1545625 RMD160 c2075ffb84fa6662e390b2b6baaccce733eedefc SHA1 6fb8c496210a3c0a0f669613014b92930a3d432b SHA256 68e8da979ef69b487a5ef237d7cc0f6d1d1cf3e027ffa2e90fa2501dc793d909
 EBUILD nvidia-settings-173.14.30.ebuild 1923 RMD160 cc355c3bc90b009e1605b919fcf7201456e70b5d SHA1 8e34fbe918868f2b8c6ef1a88ba753f2ed885104 SHA256 da4dd758eb8cc27d0b842cefc3599b36535c35d5c946558b40644cc0b7097599
 EBUILD nvidia-settings-185.18.36.ebuild 1928 RMD160 a6a728f6a8d8e0227265a95f611afe126a118e25 SHA1 2e7761f364268dcb428bcbd66f27448a40659561 SHA256 455f341ff87612e4d6ef33b03cd779057cb4422c7cba5f7b1d61548281c5b384
 EBUILD nvidia-settings-190.53.ebuild 2015 RMD160 b750992206e9841154200d0780fade6b1e06c6ce SHA1 3ef37315ae637547ba6b24a3e2d4a65728314d64 SHA256 fff0899177d24ae41a771fd8d532da04400d609e3892a50f65a08327153b0071
 EBUILD nvidia-settings-195.36.24.ebuild 2024 RMD160 d07c4c9e3925db8d9397defd80873799ad2e2072 SHA1 67bfe6c7584eba1d686285eef03eef7d9d8483d9 SHA256 ff03cac6dc25fd9adbb9a40236d4e1b01dfea1ca04739b9b2d97641f7a080263
 EBUILD nvidia-settings-195.36.31.ebuild 2026 RMD160 41095f50c603f7a631095bf5519cf0a31a689e17 SHA1 de98c156bbefd6c8c9e2392282257168fa084ba7 SHA256 bbf92cdb9b1464930be89c689e89286611d0e18fdaabe3e0bdabd60186e39470
 EBUILD nvidia-settings-260.19.29.ebuild 1944 RMD160 5e0142afc4893181fe9994d3b295020d3b0e2c76 SHA1 242864e8da517bc467f5ab4d37c0b43fbf41dbc5 SHA256 cce97fc9d2e4cc079a7d68945dbdbf162b3250e4c52b8d9dc7bda936972ae97a
-EBUILD nvidia-settings-275.09.07.ebuild 1906 RMD160 2070af1a8db4f1687dbcf1bd644e461b06c9d746 SHA1 cb3987cc480591f9d12d37eb7ab479c3b2495731 SHA256 55a4ecee5fcee3c6254326fae9e2ef043f9904aa2474f9dc64cb3e80a6f73514
-EBUILD nvidia-settings-275.43.ebuild 1903 RMD160 acd51e073fb1c79f649d04521c73f66197d6b2cd SHA1 04aa5a4825eef6f8f5f60e996a755bc151c7b08f SHA256 9f107bc1db3f5345bf4c6f6067e81c697535b12277351202122f0967a6a24097
-EBUILD nvidia-settings-290.10.ebuild 1903 RMD160 580fc86a38ebd90af304cf6139b6aa84f996febe SHA1 e2a0599a9d193645a2eae6140aaecf22c73b240b SHA256 d356943823ab884e1d46e112472b7d17bfab0203ab6b80eb8ba37984cabdb4cd
-EBUILD nvidia-settings-295.20.ebuild 1903 RMD160 ea0a3ff1c6e40a3402b9efbc1e830de1b5ed2224 SHA1 3ccfa3f5615f2af319aeda92882daff4e57f418c SHA256 3b78689865e9ffedffc6baca54f24452c000159035b6882ae3808bcefc264bcd
-MISC ChangeLog 20776 RMD160 00385e9c1a3bbd0914dd52177fb8d9da21f641b8 SHA1 3791bbdef3f29e420dc7ba3b01a5268113ed7dac SHA256 7127bc3ecf3f846d5b8345d24b3c7d481b0a506178f51accbb2b0ea06965cf9c
+EBUILD nvidia-settings-275.43.ebuild 1865 RMD160 45fdbcda2515aaa33d0ddb3e391c2d32871171a1 SHA1 d3a038afdf71d1e59e729227838af38a6928f8b9 SHA256 71b23ceda8929da02fab6135ab74ee1837d77025f7a2087e602d7c79e0b630f8
+EBUILD nvidia-settings-290.10.ebuild 1865 RMD160 f32fb2cf19852ccfa257f53b007fef89ad6e7cc9 SHA1 9b010e4cd55b289126b52a863301558b131e9aea SHA256 555339523528e467efb25d42d145d71e6d890a9bd7deec11ef1b860a5371237b
+EBUILD nvidia-settings-295.20.ebuild 1865 RMD160 175b2e9433cb5146ad6555db89e75e258c796818 SHA1 fadc35ab439715621a52f84d7f1b005f0fc3dad8 SHA256 ce19accbd276e877373e92476fdcf3255567a8f0a93d2c1e40bcbbf725845d2b
+EBUILD nvidia-settings-295.40.ebuild 1865 RMD160 f8553c18f8177d1dcc5dbe65fb1965dfcc4a0668 SHA1 c7bc4fb33fe9bf48dfe984ebdc0c5314758d9f6a SHA256 1afb16d2d73d4bbcd2d2384ca8548be808067127b6927b44107a5698f07eeffe
+MISC ChangeLog 21282 RMD160 682c5dd52fb627de63f23f9b75a08cac9f550658 SHA1 b0e4bfb3bb08d8bab990073bec4410a9fea25774 SHA256 5e2a2b5cf6d8a2950ccb4150a143bf479b732e89760c77da06286d9b84727e9d
 MISC metadata.xml 235 RMD160 0716826a6dd51819a2d989fb883ad83c265e9818 SHA1 e37ad80a2c9aca6ae43658946bdd64a21235a600 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPRA7VAAoJEMOx0zmdw4Z1gyUIAL6hPoQio18u60bpr2YxtAx2
-lngiAU7VjtGreMqbwg7oV2yEIZX0n++5QSZid+fvNjyNwDdGh3nTfZ7mKgFeuXX6
-E1/XrxGYtDfZitxIlWgVP8kuk7S3IGTRAbGXXv98+arjcG53NnOb5j707fDJ4QqT
-Ra0h+jpn2llxzQ1XF7+/3Fk5btti+sB39w7QuyFTitdLSoLPPCI94xPmRh3Vi0hx
-cAk9AgVUBwTJwc9SrpO+ivECH+aAF2z1br/YgMJpTn+wuBv8SrcHcdin5j2ytpEy
-FCQvzO3afuJo57A+Gh2NjI5BXs4cJ2TIC8tyn8PI+blqHGkgkhjv9YUgBsbVjDE=
-=gLjO
+iQEcBAEBCAAGBQJPjwsdAAoJEMOx0zmdw4Z1fsQH/0dAvcmbNSpnir52O2Z6seNN
++rTFV5GJq5OZSU8oVgH1yWdCtEMg4Pgj40P06KGZ9onEMmSL863RYB9giq0W01M3
+NvRt0u+CUX7ZpbVvkiUQUE/GFD/7+OKF9ec+zhRzzU7yfklOMuuIh2Yzxq1Aifga
+sDeK7bh7xBKerMZTVEwZrPElcZ9Jr+6t8f4qfpPVrAd1ofIbkf+17/Nr8DncKzYi
+SJ3RUmXp41cf87cfYJ+XUVLS4e8VaaavdFxer23+o/FrPxFGlVW49WpkfbpQhURD
+dOKwvvSwDdXAVUCRovsBXnZvxmahOOP0M/Lbl51wrPiszJgH/rAAyq9rtTQNzV0=
+=8c/W
 -----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch b/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch
deleted file mode 100644
index 6f47d99609e9..000000000000
--- a/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ur nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.c nvidia-settings-1.0/src/gtk+-2.x/ctkui.c
---- nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.c	2007-11-15 01:43:51.000000000 +0100
-+++ nvidia-settings-1.0/src/gtk+-2.x/ctkui.c	2007-11-20 21:07:50.000000000 +0100
-@@ -37,6 +37,11 @@
-     gtk_init(argc, argv);
- }
- 
-+gboolean ctk_init_check(int *argc, char **argv[])
-+{
-+    return gtk_init_check(argc, argv);
-+}
-+
- char *ctk_get_display(void)
- {
-     return gdk_get_display();
-diff -ur nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.h nvidia-settings-1.0/src/gtk+-2.x/ctkui.h
---- nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.h	2007-11-15 01:43:51.000000000 +0100
-+++ nvidia-settings-1.0/src/gtk+-2.x/ctkui.h	2007-11-20 21:07:50.000000000 +0100
-@@ -28,9 +28,12 @@
- #include "NvCtrlAttributes.h"
- #include "parse.h"
- #include "config-file.h"
-+#include <gtk/gtk.h>
- 
- void ctk_init(int *argc, char **argv[]);
- 
-+gboolean ctk_init_check(int *argc, char **argv[]);
-+
- char *ctk_get_display(void);
- 
- void ctk_main(NvCtrlAttributeHandle **, int,
-Only in nvidia-settings-1.0/src/gtk+-2.x: ctkui.h.orig
-diff -ur nvidia-settings-1.0-old/src/nvidia-settings.c nvidia-settings-1.0/src/nvidia-settings.c
---- nvidia-settings-1.0-old/src/nvidia-settings.c	2007-11-15 01:43:51.000000000 +0100
-+++ nvidia-settings-1.0/src/nvidia-settings.c	2007-11-20 21:10:31.000000000 +0100
-@@ -22,6 +22,8 @@
-  *
-  */
- 
-+#include <gtk/gtk.h>
-+
- #include "NvCtrlAttributes.h"
- 
- #include "command-line.h"
-@@ -44,7 +46,9 @@
-     NvCtrlAttributeHandle **vcsc_handles = NULL;
-     Options *op;
-     int ret, i, num_screen_handles, num_gpu_handles, num_vcsc_handles;
--    
-+    char *dpy = NULL;
-+    int gui = 0;
-+
-     /*
-      * initialize the ui
-      *
-@@ -52,14 +56,21 @@
-      * may not even use the gui, but we want the toolkit to have a
-      * chance to parse the commandline before we do... we should
-      * investigate gtk_init_check().
-+     *
-+     * gui flag used to decide if gtk should be used or not, as
-+     * use might just use control the display from a remote console
-+     * but for some reason cannot initialize the gtk gui. - TY 2005-05-27
-      */
--    
--    ctk_init(&argc, &argv);
--    
-+
-+
-+    if (ctk_init_check(&argc, &argv) == TRUE) {
-+        dpy = ctk_get_display();
-+        gui = 1;
-+    }
-+
-     /* parse the commandline */
-     
--    op = parse_command_line(argc, argv, ctk_get_display());
--
-+    op = parse_command_line(argc, argv, dpy);
-     /* process any query or assignment commandline options */
- 
-     if (op->num_assignments || op->num_queries) {
-@@ -67,6 +78,14 @@
-         return ret ? 0 : 1;
-     }
-     
-+    /* quit here if display is undefineds - TY 2005-05-27 */
-+
-+    if (op->ctrl_display == NULL) {
-+        nv_error_msg("Display is undefined, please run `%s --help` "
-+                     "for usage information.\n", argv[0]);
-+        return 1;
-+    }
-+    
-     /* initialize the parsed attribute list */
- 
-     p = nv_parsed_attribute_init();
-@@ -165,6 +184,14 @@
-     }
-     
-     /* pass control to the gui */
-+    /*
-+     * if gtk wasn't initiated, exit here.
-+     * Using a -c flag without gtk would behave as if using -l - TY 2005-05-27
-+     */
-+    if (gui == 0) {
-+        nv_error_msg("Unable to create gui.\n");
-+        return 1;
-+    }
- 
-     ctk_main(screen_handles, num_screen_handles,
-              gpu_handles, num_gpu_handles,
diff --git a/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch b/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
deleted file mode 100644
index 77ce7d536011..000000000000
--- a/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
-+++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
-@@ -210,11 +210,12 @@
-     if (vm) free(vm);
- 
-     /* restore the original error handler, if we overrode it */
--
-+#if defined(X_XF86VidModeGetGammaRampSize)
-     if (prev_error_handler) {
-         XSetErrorHandler(prev_error_handler);
-         prev_error_handler = NULL;
-     }
-+#endif
- 
-     return NULL;
- 
diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.25.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.25.ebuild
deleted file mode 100644
index ae73085e2d71..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-173.14.25.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 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.25.ebuild,v 1.2 2011/03/30 08:10:09 nirbheek Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-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=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND="x11-libs/gtk+:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	make clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	# Install the executable
-	exeinto /usr/bin
-	doexe nvidia-settings
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${FILESDIR}/icon/${PN}.png"
-	domenu "${FILESDIR}/icon/${PN}.desktop"
-
-	# Install manpage
-	doman doc/nvidia-settings.1
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-173.14.27.ebuild b/media-video/nvidia-settings/nvidia-settings-173.14.27.ebuild
deleted file mode 100644
index 4ed68abbbb4d..000000000000
--- a/media-video/nvidia-settings/nvidia-settings-173.14.27.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 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.27.ebuild,v 1.2 2011/03/30 08:10:09 nirbheek Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-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=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND="x11-libs/gtk+:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	make clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	# Install the executable
-	exeinto /usr/bin
-	doexe nvidia-settings
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${FILESDIR}/icon/${PN}.png"
-	domenu "${FILESDIR}/icon/${PN}.desktop"
-
-	# Install manpage
-	doman doc/nvidia-settings.1
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
index b9a2a53f7a6d..f74afa56f883 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-275.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.2 2012/02/21 21:38:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.43.ebuild,v 1.3 2012/04/18 18:42:27 idl0r Exp $
 
 EAPI=4
 
@@ -15,26 +15,23 @@ 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"
-
-#RDEPEND="x11-drivers/nvidia-drivers
-#	${COMMON_DEPEND}"
-#DEPEND="${RDEPEND}
-#	dev-util/pkgconfig
-#	x11-proto/xproto"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND=""
+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"
+
+RDEPEND="x11-drivers/nvidia-drivers
+	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -49,12 +46,12 @@ src_compile() {
 	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  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	einfo "Building nvidia-settings..."
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-#	emake DESTDIR="${D}" PREFIX=/usr install
+	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -64,8 +61,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-#	doicon doc/${PN}.png
-#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
diff --git a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
index a4c7767f5c97..e35df65eb221 100644
--- a/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-290.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.3 2012/02/21 21:38:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-290.10.ebuild,v 1.4 2012/04/18 18:42:27 idl0r Exp $
 
 EAPI=4
 
@@ -15,26 +15,23 @@ 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"
-
-#RDEPEND="x11-drivers/nvidia-drivers
-#	${COMMON_DEPEND}"
-#DEPEND="${RDEPEND}
-#	dev-util/pkgconfig
-#	x11-proto/xproto"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND=""
+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"
+
+RDEPEND="x11-drivers/nvidia-drivers
+	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -49,12 +46,12 @@ src_compile() {
 	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  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	einfo "Building nvidia-settings..."
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-#	emake DESTDIR="${D}" PREFIX=/usr install
+	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -64,8 +61,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-#	doicon doc/${PN}.png
-#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
diff --git a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
index dfecc450315f..df1895c2b689 100644
--- a/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.2 2012/02/21 21:38:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.20.ebuild,v 1.3 2012/04/18 18:42:27 idl0r Exp $
 
 EAPI=4
 
@@ -15,26 +15,23 @@ 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"
-
-#RDEPEND="x11-drivers/nvidia-drivers
-#	${COMMON_DEPEND}"
-#DEPEND="${RDEPEND}
-#	dev-util/pkgconfig
-#	x11-proto/xproto"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND=""
+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"
+
+RDEPEND="x11-drivers/nvidia-drivers
+	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -49,12 +46,12 @@ src_compile() {
 	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  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	einfo "Building nvidia-settings..."
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-#	emake DESTDIR="${D}" PREFIX=/usr install
+	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -64,8 +61,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-#	doicon doc/${PN}.png
-#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt
diff --git a/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
index d5ceab400c87..9d395c186e52 100644
--- a/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-275.09.07.ebuild,v 1.2 2012/02/21 21:38:23 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-295.40.ebuild,v 1.1 2012/04/18 18:42:27 idl0r Exp $
 
 EAPI=4
 
@@ -15,26 +15,23 @@ 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"
-
-#RDEPEND="x11-drivers/nvidia-drivers
-#	${COMMON_DEPEND}"
-#DEPEND="${RDEPEND}
-#	dev-util/pkgconfig
-#	x11-proto/xproto"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXext"
-RDEPEND=""
+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"
+
+RDEPEND="x11-drivers/nvidia-drivers
+	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
 
 src_prepare() {
 	epatch "${FILESDIR}/0001-Makefile-improvements.patch"
@@ -49,12 +46,12 @@ src_compile() {
 	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  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
+	einfo "Building nvidia-settings..."
+	emake  CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD=/bin/true
 }
 
 src_install() {
-#	emake DESTDIR="${D}" PREFIX=/usr install
+	emake DESTDIR="${D}" PREFIX=/usr install
 
 	# Install libXNVCtrl and headers
 	insinto /usr/$(get_libdir)
@@ -64,8 +61,8 @@ src_install() {
 	doins src/libXNVCtrl/*.h
 
 	# Install icon and .desktop entry
-#	doicon doc/${PN}.png
-#	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
+#	doicon doc/${PN}.png # Installed through nvidia-drivers
+	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Application
 
 	# Now install documentation
 	dodoc doc/*.txt