Index: nvidia-drivers-173.14.27.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 nvidia-drivers-173.14.27.ebuild
--- nvidia-drivers-173.14.27.ebuild	16 Jul 2010 20:28:53 -0000	1.1
+++ nvidia-drivers-173.14.27.ebuild	17 Jul 2010 01:16:49 -0000
@@ -30,9 +30,14 @@
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
-	kernel_linux? ( virtual/modutils )
-	acpi? ( sys-power/acpid )"
-PDEPEND="gtk? ( media-video/nvidia-settings )"
+	acpi? ( sys-power/acpid )
+	gtk? (
+		!media-video/nvidia-settings
+		dev-libs/atk
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	kernel_linux? ( virtual/modutils )"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -74,6 +79,7 @@
 	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
+	usr/bin/nvidia-settings
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig"
 
@@ -104,6 +110,7 @@
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/lib64/libvdpau_nvidia.so.${PV}
+	usr/bin/nvidia-settings
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig"
 
@@ -116,6 +123,7 @@
 	usr/lib/xorg/modules/drivers/nvidia_drv.so
 	usr/lib/libXvMCNVIDIA.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
+	usr/bin/nvidia-settings
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig"
 
@@ -327,7 +335,7 @@
 		die "failed to create libXvMCNVIDIA.so symlink"
 
 	# CUDA headers (driver to come)
-	if use kernel_linux; then
+	if use kernel_linux && [[ -d usr/include/cuda ]]; then
 		dodir /usr/include/cuda
 		insinto /usr/include/cuda
 		doins usr/include/cuda/*.h || die "failed to install cuda headers"
@@ -346,19 +354,35 @@
 	if use x86-fbsd; then
 		dodoc "${NV_DOC}/README"
 		doman "${NV_MAN}/nvidia-xconfig.1"
+		use gtk && 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"
 		doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		if use gtk; then
+			doman "${NV_MAN}/nvidia-settings.1.gz"
+			dodoc "${NV_DOC}/nvidia-settings-user-guide.txt"
+		fi
 	fi
 
 	# Helper Apps
 	dobin ${NV_EXEC}/nvidia-xconfig || die
 	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+	if use gtk; then
+		dobin ${NV_EXEC}/nvidia-settings || die
+	fi
 	if use kernel_linux; then
 		dobin ${NV_EXEC}/nvidia-smi || die
+		# nvidia-settings desktop entry
+		if use gtk; then
+			doicon usr/share/pixmaps/nvidia-settings.png || die
+			sed -e 's|__UTILS_PATH__/||g' \
+				-e 's|__PIXMAP_PATH__/||g' \
+				-i usr/share/applications/nvidia-settings.desktop || die
+			domenu usr/share/applications/nvidia-settings.desktop || die
+		fi
 	fi
 
 	if has_multilib_profile ; then