dev-util/nvidia-cuda-toolkit: add missing RDEPENDs

Closes: https://bugs.gentoo.org/904504
Closes: https://bugs.gentoo.org/872818
Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 20 insertions, 13 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
index fc877f208bfc..81874e5dce5f 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r4.ebuild
@@ -28,14 +28,12 @@ RDEPEND="
 	nsight? (
 		dev-libs/libpfm
 		dev-libs/wayland
+		dev-qt/qtwayland:6
 		|| (
 			dev-libs/openssl-compat:1.1.1
 			=dev-libs/openssl-1.1.1*
 		)
-		|| (
-			media-libs/tiff-compat:4
-			media-libs/tiff:0/0
-		)
+		media-libs/tiff-compat:4
 		sys-libs/zlib
 	)
 	vis-profiler? (
@@ -43,7 +41,7 @@ RDEPEND="
 	)"
 
 QA_PREBUILT="opt/cuda/*"
-CHECKREQS_DISK_BUILD="6800M"
+CHECKREQS_DISK_BUILD="15000M"
 
 pkg_setup() {
 	check-reqs_pkg_setup
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
index 5bb3064ac816..3d56dff74f93 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 LICENSE="NVIDIA-CUDA"
 SLOT="0/${PV}"
 KEYWORDS="-* ~amd64 ~amd64-linux"
-IUSE="debugger nsight profiler rdma vis-profiler sanitizer"
+IUSE="debugger examples nsight profiler rdma vis-profiler sanitizer"
 RESTRICT="bindist mirror"
 
 # since CUDA 11, the bundled toolkit driver (== ${DRIVER_PV}) and the
@@ -23,9 +23,14 @@ RESTRICT="bindist mirror"
 RDEPEND="
 	<sys-devel/gcc-13_pre[cxx]
 	>=x11-drivers/nvidia-drivers-525.60.13
+	examples? (
+		media-libs/freeglut
+		media-libs/glu
+	)
 	nsight? (
 		dev-libs/libpfm
 		dev-libs/wayland
+		dev-qt/qtwayland:6
 		|| (
 			dev-libs/openssl-compat:1.1.1
 			dev-libs/openssl:0/1.1
@@ -227,7 +232,8 @@ src_install() {
 		# TODO: unbundle sqlite
 	fi
 
-	exes=(
+	if use examples; then
+		local exes=(
 			extras/demo_suite/bandwidthTest
 			extras/demo_suite/busGrind
 			extras/demo_suite/deviceQuery
@@ -235,18 +241,21 @@ src_install() {
 			extras/demo_suite/oceanFFT
 			extras/demo_suite/randomFog
 			extras/demo_suite/vectorAdd
-	)
+		)
+
+		# set executable bit on demo_suite binaries
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+	else
+		rm -r "${ED}"/${cudadir}/extras/demo_suite || die
+	fi
 
 	# remove rdma libs (unless USE=rdma)
 	if ! use rdma; then
 		rm "${ED}"/${cudadir}/targets/x86_64-linux/lib/libcufile_rdma* || die
 	fi
 
-	# set executable bit on demo_suite binaries
-	for f in "${exes[@]}"; do
-		fperms +x ${cudadir}/${f}
-	done
-
 	# Add include and lib symlinks
 	dosym targets/x86_64-linux/include ${ecudadir}/include
 	dosym targets/x86_64-linux/lib ${ecudadir}/lib64