From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-898033-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id CC97413832E
	for <garchives@archives.gentoo.org>; Sun, 21 Aug 2016 17:57:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 16BCC21C04E;
	Sun, 21 Aug 2016 17:57:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B37C321C04E
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Aug 2016 17:57:48 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id CA1BF340766
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Aug 2016 17:57:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BE312462
	for <gentoo-commits@lists.gentoo.org>; Sun, 21 Aug 2016 17:57:46 +0000 (UTC)
From: "Pacho Ramos" <pacho@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, "Pacho Ramos" <pacho@gentoo.org>
Message-ID: <1471802260.7759195015c8a4457cc0266090b6dae04754a7ca.pacho@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/hwloc/hwloc-1.11.2.ebuild
X-VCS-Directories: sys-apps/hwloc/
X-VCS-Committer: pacho
X-VCS-Committer-Name: Pacho Ramos
X-VCS-Revision: 7759195015c8a4457cc0266090b6dae04754a7ca
X-VCS-Branch: master
Date: Sun, 21 Aug 2016 17:57:46 +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: 51a475c7-f71c-4835-b0aa-1dade877223e
X-Archives-Hash: e8857cf75d71081f140c70b464bb04ec

commit:     7759195015c8a4457cc0266090b6dae04754a7ca
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 17:56:54 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 17:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77591950

sys-apps/hwloc: Allow nvidia-drivers usage (#581004)

Package-Manager: portage-2.3.0

 sys-apps/hwloc/hwloc-1.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.2.ebuild b/sys-apps/hwloc/hwloc-1.11.2.ebuild
index cf5e10e..ae80e1c 100644
--- a/sys-apps/hwloc/hwloc-1.11.2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2.ebuild
@@ -23,7 +23,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	gl? ( media-video/nvidia-settings )
+	gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] media-video/nvidia-settings ) )
 	opencl? ( x11-drivers/ati-drivers:* )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]