sys-apps/hwloc: Fix bug #581004 properly.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
index 59925c4ebf8ef50e62bdb0857cd96b5867a8c1e1..6fb27b121184f210e39d934b478d929881fca436 100644 (file)
--- 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 7820cb16d76745a27e7c1dcb1b36aff33d9c8647..1fa235b2a76e8957feada1085818ba842d8c3f2c 100644 (file)
--- 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 0f9d22c762ef42ec8836c473319f61d05d850559..3e1ea17111cf6476d0d04c81b1c2d955b6493e3b 100644 (file)
--- 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 f28b21554d11f46c024f761854fbfbaa0a97135f..d47d723c140b1ef9b9b0ff9a1ae4db0b2869251c 100644 (file)
--- 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 9bfbd90e2f4af020d02cd001224ec7c2520ea43b..6a35bbb682245846a0870d455d5a82091d71ddc2 100644 (file)
--- 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 e589dac9c507bd4151fe73bea1e089b6977d3b25..1126ed74f095f488ca019e16b9dbb3bd45ec513b 100644 (file)
--- 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