[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[Jeroen Roovers]

commit:     53461784a9f947e01ea5fb96b93f8e9d6cba3fcc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 11:15:36 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 11:18:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53461784

x11-drivers/nvidia-drivers: Block media-video/nvidia-settings.

Package-Manager: portage-2.2.27

 x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
index edd77e8..db9410f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
@@ -55,6 +55,7 @@ DEPEND="
 RDEPEND="
        ${COMMON}
        acpi? ( sys-power/acpid )
+       tools? ( !media-video/nvidia-settings )
        X? (
                <x11-base/xorg-server-1.18.99:=
                >=x11-libs/libvdpau-0.3-r1