Install nvidia-settings appropriate for this version (bug #304255).

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

3 files changed, 27 insertions, 9 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 4dd52c878707..fa39cb2d5288 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.272 2011/04/07 06:33:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.273 2011/04/09 15:27:00 jer Exp $
+
+  09 Apr 2011; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-96.43.19.ebuild:
+  Install nvidia-settings appropriate for this version (bug #304255).
 
 *nvidia-drivers-260.19.44 (07 Apr 2011)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 6a396fab9793..3c4c988292d9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -86,13 +86,13 @@ EBUILD nvidia-drivers-260.19.44.ebuild 16198 RMD160 f643326e85dba5e69315fcf707a8
 EBUILD nvidia-drivers-270.18.ebuild 16619 RMD160 bc707a5f919e34d432cbac9f4cd216afbde8487e SHA1 e595fc2c4bae0c3c9c4714e4fe6e86e30ee95734 SHA256 98223e364297d34108f88b0da245dc55890764a450631c7120a82449133b0359
 EBUILD nvidia-drivers-96.43.16.ebuild 15375 RMD160 7f5c11269019caa7a32416a1762404487a17b76a SHA1 a78162fc120650cde3fe7078a481c24bad50df4f SHA256 9260a5e3421b9b9f7a704531bb965d7bd317e552fc3a35140faf3838ae78621e
 EBUILD nvidia-drivers-96.43.18.ebuild 15371 RMD160 157df03ce0e958ac9f06aa602a762a5da23b4468 SHA1 677b245bbf68381db0ea3b03f03db2aa83bcc7c0 SHA256 7191c8ed7f3aa4682d312c7ad1973e9df94a195fada91340fc8e3450b416838a
-EBUILD nvidia-drivers-96.43.19.ebuild 15363 RMD160 5dba1acc31669bead70a48ff985b1ac6464bb279 SHA1 79db9caa4cab0d39f054e9432b93420f2e55c407 SHA256 dcd00862dea4287bbaaa461fc2b92993aba94b4da58c85dc7bad67c1f5d98395
-MISC ChangeLog 58449 RMD160 b69fd56c07cbbf4717c5f7c08d2afd42992c54fb SHA1 6a95a7b37d809344bdbf7b0834b281b6f9e938ea SHA256 569ce0c34c52da3dfeb8f1449558182ba423a9d77775077ffa61527369eaaa10
+EBUILD nvidia-drivers-96.43.19.ebuild 15617 RMD160 d46e46463f8bd2a4b1134e3d76154b4b1cc9fe8d SHA1 56d6f475febd13efda209a28f1b9619460490e39 SHA256 7623d709b3d315a49a3a778f04852df68be7cbc2fa604817ef53c6af042f031b
+MISC ChangeLog 58598 RMD160 ce935a851ece020df4b5aacc1b1d6bc9c92ceb17 SHA1 821588c5871b4922f94d627edb18273aea19536b SHA256 ec822d94bb9c1b1fd9b6976459c7d6e8bd663f8d9083f0b2f0fe158cab76231d
 MISC metadata.xml 549 RMD160 b6f8cfd5fe9668f4031b43d2167ba4712b3cb508 SHA1 c48be9c87aa8b237fa09848a53625f8312fa2056 SHA256 22653e2d8ee95e57ce47b6292a9988feecada431dde56c2c97198efd6f4b9354
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2dWsgACgkQgAnW8HDreRbRFQCgrqILALh3lC/YqR0aUVEl0kmJ
-RnIAoKn+7jcP5Y3wJZhwMg5y/Iz0KlKT
-=zAdX
+iEYEARECAAYFAk2ges0ACgkQVWmRsqeSphMFgQCeLiULbDf1AyzI1I0EcgZ6SaWC
+IvMAn17mDQSC7hap6lxR1SwJgQzck0oX
+=d+k0
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild
index b0b9648d6fcb..aa18860d4485 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild,v 1.4 2010/12/25 19:38:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.19.ebuild,v 1.5 2011/04/09 15:27:00 jer Exp $
 
 EAPI="2"
 
@@ -24,6 +24,16 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="x11-base/xorg-server
+	gtk? (
+		!media-video/nvidia-settings
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango
+	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-opengl )
 	>=app-admin/eselect-opengl-1.0.9"
@@ -32,7 +42,6 @@ DEPEND="${COMMON}
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
 	acpi? ( sys-power/acpid )"
-PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
@@ -74,6 +83,7 @@ QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
 	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 +114,7 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	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 +127,7 @@ QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	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"
 
@@ -357,6 +369,9 @@ src_install() {
 	# Helper Apps
 	dobin ${NV_EXEC}/nvidia-xconfig || die
 	dobin ${NV_EXEC}/nvidia-bug-report.sh || die
+	if use gtk; then
+		dobin usr/bin/nvidia-settings || die
+	fi
 #	if use kernel_linux; then
 #		dobin ${NV_EXEC}/nvidia-smi || die
 #	fi