commit: fa8e597a44313386b434dc12a848879b96863e72
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 19:13:25 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 19:13:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8e597a
sys-apps/hwloc: Fix bug #581004 properly.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/hwloc/hwloc-1.10.0-r2.ebuild | 4 ++--
sys-apps/hwloc/hwloc-1.10.0.ebuild | 4 ++--
sys-apps/hwloc/hwloc-1.10.1-r1.ebuild | 4 ++--
sys-apps/hwloc/hwloc-1.7.2.ebuild | 4 ++--
sys-apps/hwloc/hwloc-1.8.1.ebuild | 4 ++--
sys-apps/hwloc/hwloc-1.9.ebuild | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
index 59925c4..6fb27b1 100644
--- a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg
static-libs xml X"
RDEPEND="sys-libs/ncurses
cairo? ( x11-libs/cairo[X?,svg?] )
cuda? ( dev-util/nvidia-cuda-toolkit )
- 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
diff --git a/sys-apps/hwloc/hwloc-1.10.0.ebuild
b/sys-apps/hwloc/hwloc-1.10.0.ebuild
index 7820cb1..1fa235b 100644
--- a/sys-apps/hwloc/hwloc-1.10.0.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg
static-libs xml X"
RDEPEND="sys-libs/ncurses
cairo? ( x11-libs/cairo[X?,svg?] )
cuda? ( dev-util/nvidia-cuda-toolkit )
- 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
diff --git a/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild
b/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild
index 0f9d22c..3e1ea17 100644
--- a/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -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[${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}]
diff --git a/sys-apps/hwloc/hwloc-1.7.2.ebuild
b/sys-apps/hwloc/hwloc-1.7.2.ebuild
index f28b215..d47d723 100644
--- a/sys-apps/hwloc/hwloc-1.7.2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg
static-libs xml X"
RDEPEND="sys-libs/ncurses
cairo? ( x11-libs/cairo[X?,svg?] )
cuda? ( dev-util/nvidia-cuda-toolkit )
- 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
diff --git a/sys-apps/hwloc/hwloc-1.8.1.ebuild
b/sys-apps/hwloc/hwloc-1.8.1.ebuild
index 9bfbd90..6a35bbb 100644
--- a/sys-apps/hwloc/hwloc-1.8.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg
static-libs xml X"
RDEPEND="sys-libs/ncurses
cairo? ( x11-libs/cairo[X?,svg?] )
cuda? ( dev-util/nvidia-cuda-toolkit )
- 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
diff --git a/sys-apps/hwloc/hwloc-1.9.ebuild b/sys-apps/hwloc/hwloc-1.9.ebuild
index e589dac..1126ed7 100644
--- a/sys-apps/hwloc/hwloc-1.9.ebuild
+++ b/sys-apps/hwloc/hwloc-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg
static-libs xml X"
RDEPEND="sys-libs/ncurses
cairo? ( x11-libs/cairo[X?,svg?] )
cuda? ( dev-util/nvidia-cuda-toolkit )
- 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
