Rename the 'gtk' USE flag to 'tools' since its more appropriate.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 25 insertions, 19 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 1e68ee2e25cc..658a81ea9a75 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.341 2012/05/04 14:51:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.342 2012/05/04 14:58:57 cardoe Exp $
+
+  04 May 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-295.49.ebuild,
+  metadata.xml:
+  Rename the 'gtk' USE flag to 'tools' since its more appropriate.
 
   04 May 2012; Doug Goldstein <cardoe@gentoo.org>
   -nvidia-drivers-295.33.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 9d8bea7a2529..2c95639e647f 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -38,7 +38,7 @@ EBUILD nvidia-drivers-290.10-r2.ebuild 17634 RMD160 b7622700747478a2c2736d85e30d
 EBUILD nvidia-drivers-290.10.ebuild 17229 RMD160 5638271cc9a33df494db4031564b2d6a1acd52c3 SHA1 eea6e6f7d929bbdf7c8da3ce65d022eba71f6992 SHA256 4ae8bcb31a72588a7965dde833597c62386a6f36b1fbb4eb7d781c11304199dc
 EBUILD nvidia-drivers-295.20-r1.ebuild 17817 RMD160 fa86ce3c58e739c0a7f0ebff8d2de1d5b9b79a7f SHA1 14e8fe9a78349840c64d7bacad13c7081fe165fb SHA256 817fb32916ef517d9bd66d86f6f40a2a995783f24f032bdd6b047ad57752523b
 EBUILD nvidia-drivers-295.40.ebuild 18448 RMD160 5519b4779cdaedeae967e4a23a8f1cf3af4c44ee SHA1 ecbf72fe2e73aae4b1b14e73e06bc7b00f88e748 SHA256 b7adad353ae3cdce981f6575c157474c9e19bb195c3753ae6948cee9957ac77d
-EBUILD nvidia-drivers-295.49.ebuild 18448 RMD160 e694b3ab7497f80234c5ca65d921a0e0ef1cd0fa SHA1 8bb13c4cac1dd3dffc0cf6aaf53235ff7b619744 SHA256 d8b362a013d415617a7d12e34a0841885dd63fe9ca6a89d3bebd08d5c3e045a5
+EBUILD nvidia-drivers-295.49.ebuild 18326 RMD160 2c3af78860741749928a95f539c3c613b10a755a SHA1 b133c5fcc3e7b96d841421b21b6b066199b40337 SHA256 e67e939d309b045fa03657587c45b72346e853be0246460f4a69708a664a7753
 EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 72443 RMD160 69cbc5fa222f1b2c7489aed13cc8e75c6afa5943 SHA1 e475146659fdf571dd120f4eef2a6af0e8d4b0a2 SHA256 6bdd0da5c4bcee3d94078d619671ce819a2db0eba721767f5331d48dbb3fb68a
-MISC metadata.xml 653 RMD160 29f9c8662d2c08a9c33921ef606bf7059a30752b SHA1 8653d3a29f241f09b6b377c74f3d6a50bad69bbb SHA256 0e645c5ff2f1726137be71aaabd6c2a661602aa3526ef0500892dbfd63f5c31b
+MISC ChangeLog 72607 RMD160 370855aef6dad7c5e4bb6bfc893765403ba4e818 SHA1 52a4678e00ac7b6ce98f5c2508d9688b1e878bb9 SHA256 9d97f1409426e748961215658b59babc116995a137c28fb3bc2c864ca6878eed
+MISC metadata.xml 805 RMD160 2dba407d1bd596807d7a165b091e2d10838d7a30 SHA1 c3b311bacd6d1c916f70265369ff6263a38c411c SHA256 86490388b274c1b62b659755b80bd96f82625ed8a35c0a0d83992eee3734e4b1
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index c65f4bbb1b4f..92707bb9237f 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <maintainer>
   <email>jer@gentoo.org</email>
+  <description>Maintains legacy release support</description>
 </maintainer>
 <maintainer>
   <email>spock@gentoo.org</email>
@@ -17,4 +18,7 @@
   <description>Blame me on all OpenCL issues</description>
 </maintainer>
 <longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
+<use>
+	<flag name='tools'>Installs additional tools such as nvidia-settings</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
index d781dd77fb85..cd8991980287 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.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.49.ebuild,v 1.1 2012/05/04 14:50:38 cardoe 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
 }