From: Jeroen Roovers <jer@gentoo.org>
Date: Sat, 30 Jan 2016 11:15:36 +0000 (+0100)
Subject: x11-drivers/nvidia-drivers: Block media-video/nvidia-settings.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53461784a9f947e01ea5fb96b93f8e9d6cba3fcc;p=gentoo.git

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

Package-Manager: portage-2.2.27
---

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 edd77e89b8d7..db9410f76c5a 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