gentoo resync : 28.04.2021

7 files changed, 266 insertions, 10 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 932a84c038f8..0adba684d6ef 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -3,11 +3,13 @@ AUX nvidia-cuda-toolkit-11.2.0-nsight-systems-launcher.patch 617 BLAKE2B b5e53c8
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1 SHA512 3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9
 DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3 SHA512 0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3
+DIST cuda_11.2.2_460.32.03_linux.run 3057439068 BLAKE2B c3f3cd9eaaa4f91eb8080e7cafe1280f9bbc9cfc71ce1a6115af1dd348b83d30eed945609bf87e00d4873bede1fa9136fc4a7f393fd31db4e6406dc76086bc22 SHA512 e28d7d2eabd96df9e18f8e55f61adda39b07c2223605f77a6c2d92a02f7b57e9ce8b83d4b4de1124faa5670509d204d3db70c03b18af5cc5964b6ed6653d6a22
 DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3995 BLAKE2B 573621761045067f5c5cf85fb1e940f1f1dcdf658153bd0bdf9b81e8f69e2f14e5d4081a8249fdd6d3c5569ab735eae261ca11040680e7551b300691f974fd37 SHA512 afbdb04ed1a3a1806a4066c906d633b4c20948615aeeed0ee0f9cd3f77a866e5ca3313e43f1589bdcb78bd2a644be23507bdd42eee0bf04513cf79ebdd75d6be
-EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6310 BLAKE2B 2cad9ebac6d065b49ed781e2b62b6e430f6eadfcbe651e94cdca31601beda90c97e26da54a979ac4da396c96d91b597d984be8d9ef4bd28088a2bf774ff1cb57 SHA512 dc9df7b79120e5fd3c9915ce34c11ccc10f59b498d9859cc8ae76896e4f8e0a0c42faba918b6515eb82ec11a23bc4399b9eb37e29e38ee84ddf0634c5b853428
-EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7309 BLAKE2B 96c4c02d29f284767e2c99bab5aa0f414c7e176af51d4ea7a2f29383840107a3d5a34b6885e50535ea102f5e607bda28bcabad47043dede5ca0519ac01cd1dc1 SHA512 1625a6d127e64c536b40f1d1de721828e3a301cb2060b17fb0631e47c838f12740e9532191fbc589082f83f73a86da4afed11f009701db119f1deab1429850ab
-EBUILD nvidia-cuda-toolkit-8.0.61-r1.ebuild 3438 BLAKE2B 447655297ef7f585cdbc4c3b83c5bd567e57eb1cdf4abd3b1860a90a942470603d0ee39f4875bd94dcfc24fedcd7127c213c2e354bdef8c1267f79491258df58 SHA512 e6ea38fdc3ae521cf3b8ecc322256bb0419c44970f6d4cebe02b514e2081ac7e5938c47227b8add138cc1e69b960fe4d17a58349e3bbbd16193ad84c85f3c3ab
-EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3423 BLAKE2B c6ebbd5100931a1363ae98791b9f3d6164d2dfd8b2e1dee945b052f4eb8523b307cc2177c140c612854eaf2de006da2351db71caa6ccdcc2a1dfe95633bfaa3d SHA512 c2eb658eb429338aa825b35d6e58b4d5cf1a5dc0ffebcc2b3178bd26e4c7c6be8c9264de2aa46bdbfe26a21d3817b13ca75682c0149270f6c3b7a8a2de601a8b
+EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3985 BLAKE2B 92331a664bd83f6c79d6953ffbf13075e3f0bbe210d6d7feed37831d9ae5e98e377452d8f4a272998a6ce1df776f7e3f6b16f12d4fef38fb5f55717e937b915b SHA512 f0dbee5f2e74d8aac8f01360a5f61a95d9f4a333a1784a0544a35f02c350a7c6fa2c88aa2ed8498f6e7dca00f1b7bd41bb3d6755a79686ce3c8be301d021cfa5
+EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6300 BLAKE2B 3a31260eb005cc820b6255a8a0f9d4830a5ba6304199256100ee0baee4febc9e0adc6658b91b4a3bc30c1b5b433d3fdefd3e0ee3455247405f3c89c24df87890 SHA512 7837119c5ffed1e0b586806473e7afea74ddf04a04ef84a52ac8383d4b8c3b133092e1be6ff4c6ebc361e33b9c55c9a3b2e7f6ed93fb57f8bd8a8b43c4a311f7
+EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7299 BLAKE2B fb687ec18db88becbd1bbe677e08473f364b3951983ccd884d4ced9758c9d55f2dac18c21ee5732a28b1e8fed42181706ae477366fe45f131ab061f7389243f4 SHA512 c349a465575075807ce1cd07549f518491d7f0c47396f59b4fc9ed2d6bf4d05190bb1ec004941ade0a448f9fd50380f0f01a28b69af5b338d745dd8fb9231b71
+EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7181 BLAKE2B 8d4bbde98401f1d68b779b1b4fefb5500aa1a52643b796790c683e7422fb6fd47109186e07102bf27569733938ae902b8d8a1100c96525831995466980a3a18f SHA512 c6fd0c69a41b75c41f8ebbaaa34b12df2e2377249cc3b36dd565232f158105d900a707a425b8f4a3bb704935c0f89fadfe048ef39e46ad46c7807d3b780e5e6b
+EBUILD nvidia-cuda-toolkit-8.0.61-r1.ebuild 3434 BLAKE2B d40ad0f8948815f2e473ccf00d85409308d6c4bb077166d30dcf1f85bed17f17b7acca996ca03c2d382d74cce02c4a60d2fcdb313e6036f86876440d40aa32ec SHA512 9f01939023c35647be6d8a4b4e44d57243c8a76f072f6e567a73b7617e5a478b9e0c9266fddcbe9e4eded1e4e5dbfde8fadae0c1341eb0c3cdfe61d234637a3a
+EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3419 BLAKE2B e6e11210f880367f654031dbcdb2b6e7141f93790e59dbcae37742cc8b6ffc0a08d069836ab954ef99bcb49e55184321a4c7e241828048b7fc8146f70d668585 SHA512 253eadb778c264bde9ab316bef9bbfa2200866d049e976411aa891dad248c78b46d8f8df8010b4150d47f639ab37e9a895367f8ad0f237393829cbca49d73467
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
index 47ca14511e7d..1f8086c0ed00 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
@@ -21,7 +21,7 @@ RESTRICT="bindist mirror"
 BDEPEND=""
 RDEPEND="
 	<sys-devel/gcc-9[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm(+)]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
 		dev-libs/openssl-compat:1.0.0
 		sys-libs/libtermcap-compat
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
index 9fcf966e4472..be285b07aad8 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
@@ -20,7 +20,7 @@ RESTRICT="bindist mirror"
 BDEPEND=""
 RDEPEND="
 	<sys-devel/gcc-11_pre[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm(+)]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
 		dev-libs/openssl
 		sys-libs/libtermcap-compat
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
index 7ea8b9333ed3..8370ce210ee2 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
@@ -20,7 +20,7 @@ RESTRICT="bindist mirror"
 BDEPEND=""
 RDEPEND="
 	<sys-devel/gcc-11_pre[cxx]
-	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm(+)]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
 		dev-libs/openssl
 		sys-libs/libtermcap-compat
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
new file mode 100644
index 000000000000..e34b6ed1e494
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="460.32.03"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-11_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
+	debugger? (
+		dev-libs/openssl
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="6.5 7.5 8.4 9.3 10.2 10.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61-r1.ebuild
index 8e8adca28b39..994487cdbc25 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND=""
 RDEPEND="${DEPEND}
 	>=sys-devel/gcc-4.7[cxx]
 	<sys-devel/gcc-6[cxx]
-	>=x11-drivers/nvidia-drivers-375.26[X,uvm(+)]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses-compat:5[tinfo]
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
index 742f43c7a0ff..e7cd76dd5d97 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="bindist mirror"
 DEPEND=""
 RDEPEND="${DEPEND}
 	<sys-devel/gcc-8[cxx]
-	>=x11-drivers/nvidia-drivers-396.24[X,uvm(+)]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses-compat:5[tinfo]