From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-860435-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id C8BE558973
for <garchives@archives.gentoo.org>; Sat, 30 Jan 2016 11:18:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2650621C002;
Sat, 30 Jan 2016 11:18:16 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C9C2121C002
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 11:18:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 92CDF340B30
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 11:18:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 41FF78ED
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Jan 2016 11:18:12 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1454152690.53461784a9f947e01ea5fb96b93f8e9d6cba3fcc.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r2.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 53461784a9f947e01ea5fb96b93f8e9d6cba3fcc
X-VCS-Branch: master
Date: Sat, 30 Jan 2016 11:18:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 541053a6-4080-429a-a0a1-60f04c4cbab1
X-Archives-Hash: e5fdf598e205f33992a20c4dad8b61be
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