diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-04-25 17:16:27 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-04-25 17:16:27 +0000 |
| commit | 84d5927b122f329f07bc20b9c6ee63fa9e6e0320 (patch) | |
| tree | b6041d7aab7efeb912a7be180d9aba071e8c068d /x11-drivers | |
| parent | sci-libs/libgeotiff: Drop unnessecary die (diff) | |
| download | gentoo-2-84d5927b122f329f07bc20b9c6ee63fa9e6e0320.tar.gz gentoo-2-84d5927b122f329f07bc20b9c6ee63fa9e6e0320.tar.bz2 gentoo-2-84d5927b122f329f07bc20b9c6ee63fa9e6e0320.zip | |
Install nvidia-settings like the 96 driver does now that the matching nvidia-settings ebuild is gone.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.ebuild | 19 |
2 files changed, 22 insertions, 3 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 41becc8d938d..9dbc76aa16dc 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.337 2012/04/24 14:04:07 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.338 2012/04/25 17:16:27 jer Exp $ + + 25 Apr 2012; Jeroen Roovers <jer@gentoo.org> nvidia-drivers-173.14.31.ebuild: + Install nvidia-settings like the 96 driver does now that the matching + nvidia-settings ebuild is gone. 24 Apr 2012; Alexis Ballier <aballier@gentoo.org> nvidia-drivers-295.40.ebuild: diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.ebuild index 8866e1bedcdd..c41766d62f90 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.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-173.14.31.ebuild,v 1.5 2012/02/05 07:42:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.31.ebuild,v 1.6 2012/04/25 17:16:27 jer Exp $ EAPI="2" @@ -24,6 +24,16 @@ RESTRICT="strip" EMULTILIB_PKG="true" COMMON="<x11-base/xorg-server-1.11 + 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" @@ -31,7 +41,6 @@ DEPEND="${COMMON} kernel_linux? ( virtual/linux-sources )" RDEPEND="${COMMON} 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} @@ -73,6 +82,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" @@ -103,6 +113,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" @@ -115,6 +126,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" @@ -356,6 +368,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 |