x11-drivers/nvidia-drivers: sync with tree

MeisterP · May 5, 2012 · d26db7e · d26db7e
1 parent 9b8366d
commit d26db7e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
@@ -18,4 +18,4 @@ AUX nvidia.udev-rule 462 RMD160 a7bc1d61d75a7fd7847903064ae5974e4079db5a SHA1 ac
 DIST NVIDIA-FreeBSD-x86-302.07.tar.gz 32045274 RMD160 d6675b138cdf81b158ab2a6357ba3036b66a99ff SHA1 99da29e462543173c30392df7a907d925b1abaf9 SHA256 6d2c23cae4e0c6423498dc78625aeab9976d3429a9f131d45c390a0ee3662966
 DIST NVIDIA-Linux-x86-302.07.run 34577959 RMD160 e87566129625b3126b60657fc5d5daa3a75b7b4c SHA1 4ec033f6421bbf778d27795bbce804a960f95cc2 SHA256 6c726923dba857824a86e79b48972057d36889e06085c563c02a19a7d9fa7b3b
 DIST NVIDIA-Linux-x86_64-302.07.run 58616508 RMD160 a79d89f2e705f8419b89577a6dc9ac4da28657bb SHA1 316ab219b7a9f91d4f4e610323d94a97598ad878 SHA256 6a9e515c21afed122621a69a844a2891bb625773e481ebfe70699bf2d06be5e1
-EBUILD nvidia-drivers-302.07.ebuild 18450 RMD160 a57c83ee2868cee6552e667fc2d51693bbe5ab46 SHA1 1393ade74dd9479573166b94d1e4bd5445ad8830 SHA256 f4b52e2eb39c78701f39834c0fd4b2a360a4a73fad0b95c0508251c47e5dd929
+EBUILD nvidia-drivers-302.07.ebuild 18326 RMD160 2c3af78860741749928a95f539c3c613b10a755a SHA1 b133c5fcc3e7b96d841421b21b6b066199b40337 SHA256 e67e939d309b045fa03657587c45b72346e853be0246460f4a69708a664a7753
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-302.07.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-302.07.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/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.4 2012/04/24 14:04:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.2 2012/05/04 14:58:57 cardoe Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_P
 LICENSE="NVIDIA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi custom-cflags gtk multilib kernel_linux"
+IUSE="acpi custom-cflags multilib kernel_linux +tools"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
@@ -33,8 +33,7 @@ DEPEND="${COMMON}
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
 	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1
-	gtk? ( media-video/nvidia-settings )"
+PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
@@ -420,21 +419,21 @@ src_install() {
 	if use x86-fbsd; then
 		dodoc "${NV_DOC}/README"
 		doman "${NV_MAN}/nvidia-xconfig.1"
-		use gtk && doman "${NV_MAN}/nvidia-settings.1"
+		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"
-		use gtk && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-settings.1.gz"
 	fi
 
 	# Helper Apps
 	exeinto /opt/bin/
 	doexe ${NV_EXEC}/nvidia-xconfig || die
 	use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump || die ; }
-	if use gtk; then
+	if use tools; then
 		doexe ${NV_EXEC}/nvidia-settings || die
 	fi
 	doexe ${NV_EXEC}/nvidia-bug-report.sh || die
@@ -443,15 +442,15 @@ src_install() {
 	fi
 
 	# Desktop entries for nvidia-settings
-	if use gtk && use kernel_linux ; then
+	if use tools && use kernel_linux ; then
 		sed -e 's:__UTILS_PATH__:/opt/bin:' \
 			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
 			-i "${NV_EXEC}/nvidia-settings.desktop"
 		newmenu ${NV_EXEC}/nvidia-settings.desktop nvidia-settings-opt.desktop
-
-		doicon ${NV_EXEC}/nvidia-settings.png
 	fi
 
+	doicon ${NV_EXEC}/nvidia-settings.png
+
 	if has_multilib_profile ; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis) ; do
@@ -565,12 +564,11 @@ pkg_postinst() {
 	elog "If you are having resolution problems, try disabling DynamicTwinView."
 	elog
 
-	if ! use gtk; then
-		elog "USE=gtk controls whether the nvidia-settings application"
+	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. media-video/nvidia-settings"
-		elog "no longer installs nvidia-settings but only installs the"
-		elog "associated user space libraries."
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
 	fi
 }