Implement installing nvidia-settings when USE=gtk is enabled as discussed in bug #304255

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

4 files changed, 62 insertions, 15 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 197a530d0fe6..80c7d04b02ed 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.248 2010/08/30 20:36:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.249 2010/08/30 21:38:01 cardoe Exp $
+
+  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-256.44-r1.ebuild, nvidia-drivers-256.52.ebuild:
+  Implement installing nvidia-settings when USE=gtk is enabled as discussed
+  in bug #304255
 
   30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
   nvidia-drivers-256.52.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d90eae8f52e8..188f4f527a7e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -47,10 +47,10 @@ EBUILD nvidia-drivers-185.18.36-r1.ebuild 16269 RMD160 efcfc011de31be81a4339c7e6
 EBUILD nvidia-drivers-190.53-r1.ebuild 15484 RMD160 9677efa6e2a0da095293798813baa67544c7de88 SHA1 da524d214695935095d6bfad67da1344cc152218 SHA256 66a541fdc9f837c9e5969e472eb5493324fe27affa7706c2a65f63ca14944832
 EBUILD nvidia-drivers-195.36.24.ebuild 16151 RMD160 f24b7c3606aa81d831b3b856f00c9e60039f2c9a SHA1 d26b0b23267b5308b2226a68ef649616d1d9656a SHA256 ba473f7ace82ed993193f93eb63f7de4ca34f6b96826831fbb0b933b4240b71a
 EBUILD nvidia-drivers-195.36.31.ebuild 16173 RMD160 65b0ac664379ab4d9852476b78a3209c657e86cd SHA1 52e6375fa79898ca7d24adeb9681c88b48f4e0f3 SHA256 784428879bf361f8180ae2df8a6061f050db452bfb7b478895bfda81823c980a
-EBUILD nvidia-drivers-256.44-r1.ebuild 15049 RMD160 f724ce8e68b02369c88a8e8b3f392f1cc5113864 SHA1 acd601d950001b647fc7daf8a4814fd476528a3c SHA256 f14ce47474edd2782a5e20faa861ee63a2241291a03481cbc41f7d8b6f596573
+EBUILD nvidia-drivers-256.44-r1.ebuild 15730 RMD160 cbe3fb8ca9b1773e95bb18463c1cc54957235d48 SHA1 9001d54a961a84aef177f46a4567e6ade81b49d2 SHA256 c57b058a8b1cdd3b594ecc3fec23bd445b68172fcdf91e940c4553aae0192e38
 EBUILD nvidia-drivers-256.44.ebuild 14978 RMD160 7f399e5c3a48665db6a91691f0bd646678965461 SHA1 dec52a8e1c4f4b90103a41d84fe4902042e278e6 SHA256 25a38f763cf2873c2cdcc0af83bb2a2b952a959124d4d880be10067dc477c42c
-EBUILD nvidia-drivers-256.52.ebuild 15046 RMD160 aa87c8e5b9edeea4a44ccc6802abc8fe3f907899 SHA1 546470aedef4391c2366a774a77ff0ba043bef25 SHA256 101c180c6f3ef498ea87dd93a4a1c5686dfc639cf520569af572e70e1b1f8625
+EBUILD nvidia-drivers-256.52.ebuild 15727 RMD160 15ac78a9881b21bfc9978cd9c34185ee76b6815c SHA1 983a7a7185bf4ae3741aaf82b43f6218a780229e SHA256 e003ef95b1f998d40f3a0d2bd15c1dd9e634312102875f18dfc6b66b0bc9bba1
 EBUILD nvidia-drivers-96.43.16.ebuild 15375 RMD160 7f5c11269019caa7a32416a1762404487a17b76a SHA1 a78162fc120650cde3fe7078a481c24bad50df4f SHA256 9260a5e3421b9b9f7a704531bb965d7bd317e552fc3a35140faf3838ae78621e
 EBUILD nvidia-drivers-96.43.18.ebuild 15377 RMD160 451d351f40a33cf0de85e8339e95e806d8a9645c SHA1 e2b8918681024c3968c46f6fdb81ef88f0417908 SHA256 f5a9bb7000cf859e58d6655d29f8a2c9b710c366b3445e71eee65b12b51837a3
-MISC ChangeLog 54366 RMD160 8cc612c05cecbdb954e84ddb6df9757045ed095a SHA1 e7b6e430bb685099362e5b289545a70930aafb61 SHA256 fb327b509c1111f2cbdec3cd980d9d0ba445c520b8cc6513522a347874bda600
+MISC ChangeLog 54575 RMD160 efd0f87ca9b3e1cb47ce078d395f2acb9d249c5d SHA1 c2535a456b555eac645c3c3465bfd25345c91d5e SHA256 50fe19bf5a42a6a0ca34ddd7e8ec3a8fec6b9361047518844068a4d4f6240ca8
 MISC metadata.xml 546 RMD160 91ee180beb1b4acd8742b4ede2a528413c27d904 SHA1 6cb54af78a52760767088a1817a6f6bff19f2e08 SHA256 2e76e319e9b7db64d581d065d396c0b3ee942253d7470a9ac75d8e9131edb4eb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild
index 50fb8d995559..278aa2b00eaf 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v 1.2 2010/08/30 01:53:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.44-r1.ebuild,v 1.3 2010/08/30 21:38:01 cardoe Exp $
 
 EAPI="2"
 
@@ -23,10 +23,11 @@ IUSE="acpi custom-cflags gtk multilib kernel_linux"
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-COMMON="<x11-base/xorg-server-1.8.99
+COMMON="<x11-base/xorg-server-1.9.99
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
-	>=app-admin/eselect-opengl-1.0.9"
+	>=app-admin/eselect-opengl-1.0.9
+	!media-video/nvidia-settings"
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
@@ -92,7 +93,8 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib64/libOpenCL.so.1.0.0
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+	usr/bin/nvidia-settings"
 
 QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -131,7 +133,8 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib64/libOpenCL.so.1.0.0
 	usr/lib64/libnvidia-compiler.so.${PV}
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+	usr/bin/nvidia-settings"
 
 QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
@@ -145,7 +148,8 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libOpenCL.so.1.0.0
 	usr/lib/libnvidia-compiler.so.${PV}
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+	usr/bin/nvidia-settings"
 
 S="${WORKDIR}/"
 
@@ -360,21 +364,38 @@ 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"
 	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"
 	fi
 
 	# Helper Apps
 	dobin ${NV_EXEC}/nvidia-xconfig || die
+	use gtk && ( dobin ${NV_EXEC}/nvidia-settings || die )
 	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
 	if use kernel_linux; then
 		dobin ${NV_EXEC}/nvidia-smi || die
 	fi
 
+	# Desktop entries for nvidia-settings
+	if use gtk; then
+		dodir /usr/share/applications/
+		insinto /usr/share/applications/
+		doins ${NV_EXEC}/nvidia-settings.desktop
+		sed -e 's:__UTILS_PATH__:/usr/bin:' \
+			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+			-i "${D}"/usr/share/applications/nvidia-settings.desktop
+
+		dodir /usr/share/pixmaps/
+		insinto /usr/share/pixmaps/
+		doins ${NV_EXEC}/nvidia-settings.png
+	fi
+
 	if has_multilib_profile ; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis) ; do
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild
index 7d7bdf47e198..bbc7527a2e8b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v 1.3 2010/08/30 20:36:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.52.ebuild,v 1.4 2010/08/30 21:38:01 cardoe Exp $
 
 EAPI="2"
 
@@ -26,7 +26,8 @@ EMULTILIB_PKG="true"
 COMMON="<x11-base/xorg-server-1.9.99
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-xlibs )
-	>=app-admin/eselect-opengl-1.0.9"
+	>=app-admin/eselect-opengl-1.0.9
+	!media-video/nvidia-settings"
 DEPEND="${COMMON}
 	kernel_linux? ( virtual/linux-sources )"
 RDEPEND="${COMMON}
@@ -92,7 +93,8 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib64/libOpenCL.so.1.0.0
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+	usr/bin/nvidia-settings"
 
 QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -131,7 +133,8 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib64/libOpenCL.so.1.0.0
 	usr/lib64/libnvidia-compiler.so.${PV}
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+	usr/bin/nvidia-settings"
 
 QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
@@ -145,7 +148,8 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libOpenCL.so.1.0.0
 	usr/lib/libnvidia-compiler.so.${PV}
 	usr/bin/nvidia-smi
-	usr/bin/nvidia-xconfig"
+	usr/bin/nvidia-xconfig
+	usr/bin/nvidia-settings"
 
 S="${WORKDIR}/"
 
@@ -360,21 +364,38 @@ 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"
 	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"
 	fi
 
 	# Helper Apps
 	dobin ${NV_EXEC}/nvidia-xconfig || die
+	use gtk && ( dobin ${NV_EXEC}/nvidia-settings || die )
 	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
 	if use kernel_linux; then
 		dobin ${NV_EXEC}/nvidia-smi || die
 	fi
 
+	# Desktop entries for nvidia-settings
+	if use gtk; then
+		dodir /usr/share/applications/
+		insinto /usr/share/applications/
+		doins ${NV_EXEC}/nvidia-settings.desktop
+		sed -e 's:__UTILS_PATH__:/usr/bin:' \
+			-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+			-i "${D}"/usr/share/applications/nvidia-settings.desktop
+
+		dodir /usr/share/pixmaps/
+		insinto /usr/share/pixmaps/
+		doins ${NV_EXEC}/nvidia-settings.png
+	fi
+
 	if has_multilib_profile ; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis) ; do