From ea5a35b112853a43358eb494f59abc839e516d6f Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 20 Apr 2020 12:13:48 +0200
Subject: x11-drivers/nvidia-drivers: Depend on virtual/opencl

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Bug: https://bugs.gentoo.org/717042
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---
 x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild | 3 +--
 x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r2.ebuild  | 3 +--
 x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r2.ebuild  | 3 +--
 x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r1.ebuild  | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
index cdaa60bfd89c..d8dd669f8aec 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
@@ -38,7 +38,6 @@ REQUIRED_USE="
 "
 
 COMMON="
-	app-eselect/eselect-opencl
 	driver? ( kernel_linux? ( acct-group/video ) )
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
@@ -76,6 +75,7 @@ RDEPEND="
 	${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		<x11-base/xorg-server-1.20.99:=
@@ -547,7 +547,6 @@ pkg_postinst() {
 	if ! use libglvnd; then
 		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
 	fi
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
 
 	readme.gentoo_print_elog
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r2.ebuild
index f1bfb3b028bf..f281ac59fc4d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r2.ebuild
@@ -33,7 +33,6 @@ REQUIRED_USE="
 "
 
 COMMON="
-	app-eselect/eselect-opencl
 	driver? ( kernel_linux? ( acct-group/video ) )
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
@@ -67,6 +66,7 @@ RDEPEND="
 	${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		<x11-base/xorg-server-1.20.99:=
@@ -524,7 +524,6 @@ pkg_postinst() {
 
 	# Switch to the nvidia implementation
 	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
 
 	readme.gentoo_print_elog
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r2.ebuild
index 9bc376f9b158..b4d71c11943e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r2.ebuild
@@ -33,7 +33,6 @@ REQUIRED_USE="
 "
 
 COMMON="
-	app-eselect/eselect-opencl
 	driver? ( kernel_linux? ( acct-group/video ) )
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
@@ -71,6 +70,7 @@ RDEPEND="
 	${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		<x11-base/xorg-server-1.20.99:=
@@ -538,7 +538,6 @@ pkg_postinst() {
 	if ! use libglvnd; then
 		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
 	fi
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
 
 	readme.gentoo_print_elog
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r1.ebuild
index b28c016696c1..37b1d1b678da 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r1.ebuild
@@ -33,7 +33,6 @@ REQUIRED_USE="
 "
 
 COMMON="
-	app-eselect/eselect-opencl
 	driver? ( kernel_linux? ( acct-group/video ) )
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	tools? (
@@ -71,6 +70,7 @@ RDEPEND="
 	${COMMON}
 	acpi? ( sys-power/acpid )
 	tools? ( !media-video/nvidia-settings )
+	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		<x11-base/xorg-server-1.20.99:=
@@ -544,7 +544,6 @@ pkg_postinst() {
 	if ! use libglvnd; then
 		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
 	fi
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
 
 	readme.gentoo_print_elog
 
-- 
cgit v1.2.3