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

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

9 files changed, 104 insertions, 379 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/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