dev-util/nsight-compute: use edo, ebuild cleanup

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

dev-util/nsight-compute/nsight-compute-2025.1.1.2.ebuild

@@ -3,13 +3,14 @@
 
 EAPI=8
 
-inherit desktop unpacker
+inherit desktop edo unpacker
 
 DESCRIPTION="performance analysis tool designed to visualize an application’s algorithms"
 HOMEPAGE="https://developer.nvidia.com/nsight-systems"
 
-MY_PV=$(ver_cut 1-3)
+MY_PV="$(ver_rs 1-3 '_' "$(ver_cut 1-3)")"
-MY_PV=${MY_PV//./_}
+MY_PN="${PN//nsight-}"
+MY_PN_SHORT="cu"
 
 PV_BUILD="35528883"
 SRC_URI="
@@ -19,9 +20,10 @@ SRC_URI="
 	arm64? (
 		https://developer.nvidia.com/downloads/assets/tools/secure/${PN}/${MY_PV}/${PN}-armserver-${PV}-${PV_BUILD}.run
 	)
-	mirror+https://developer.download.nvidia.com/images/nvidia-nsight-compute-icon-gbp-shaded-128.png
+	mirror+https://developer.download.nvidia.com/images/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.png
-		-> nvidia-nsight-compute-icon-gbp-shaded-128.20231126.png
+		-> nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png
 "
+
 S="${WORKDIR}/pkg"
 
 LICENSE="NVIDIA-r2"
@@ -67,6 +69,7 @@ RDEPEND="
 	x11-libs/xcb-util-renderutil
 	x11-libs/xcb-util-wm
 "
+
 BDEPEND="
 	dev-util/patchelf
 "
@@ -80,18 +83,18 @@ src_prepare() {
 
 	pushd host/linux-desktop-* >/dev/null || die
 
-	readarray -t rpath_bins < <(find . -maxdepth 1 -name '*.bin')
+	local rpaths rpath
-	for rpath_bin in "${rpath_bins[@]}"; do
+	readarray -t rpaths < <(find . -maxdepth 1 -name '*.bin')
-		ebegin "fixing rpath for ${rpath_bin}"
+	for rpath in "${rpaths[@]}"; do
-		patchelf --set-rpath '$ORIGIN' "${rpath_bin}" || die
+		edob -m "fixing rpath for ${rpath}" \
-		eend $?
+			patchelf --set-rpath '$ORIGIN' "${rpath}"
 
 		# OpenGLVersionChecker stumbles on "OpenGL ES profile version string" so disable the check
 		sed \
 			-e "s/NV_AGORA_PATH/NV_AGORA_PATH_/g" \
 			-e "4i export QT_PLUGIN_PATH=\"\${NV_AGORA_PATH_}/Plugins\"" \
 			-e "s/AGORA_USE_MESA_FALLBACK=true/AGORA_USE_MESA_FALLBACK=false/" \
-			-i "$(basename "${rpath_bin}" .bin)" \
+			-i "$(basename "${rpath}" .bin)" \
 			|| die
 	done
 
@@ -115,28 +118,29 @@ src_install() {
 	dodir "${dir}"
 	mv ./* "${ED}${dir}" || die
 
-	local arch_dir="$(find "${ED}${dir}/host" -mindepth 1 -maxdepth 1 -name 'linux-*' -exec basename {} \;)"
+	local arch_dirs
-	if [[ -z "${arch_dir}" ]]; then
+	readarray -t arch_dirs < <(find "${ED}${dir}/host" -mindepth 1 -maxdepth 1 -name 'linux-*' -exec basename {} \;)
+	if [[ -z "${arch_dirs[*]}" ]]; then
 		die "failed to find arch dir"
 	fi
-	if [[ "$(echo "${arch_dir}" | wc -l )" -gt 1 ]]; then
+	if [[ "$(echo "${#arch_dirs[@]}" | wc -l )" -gt 1 ]]; then
-		echo ${arch_dir}
+		eerror "${arch_dirs[*]}"
-		die "found $(echo "${arch_dir}" | wc -l )"
+		die "found ${#arch_dirs[*]} arch dirs"
 	fi
 
 	cp \
-		"${DISTDIR}/nvidia-nsight-compute-icon-gbp-shaded-128.20231126.png" \
+		"${DISTDIR}/nvidia-nsight-${MY_PN}-icon-gbp-shaded-128.20231126.png" \
-		"${ED}${dir}/host/${arch_dir}/ncu-ui.png" \
+		"${ED}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui.png" \
 			|| die
 
 	newmenu - "${P}.desktop" <<-EOF || die
 		[Desktop Entry]
 		Type=Application
-		Name=NVIDIA Nsight Compute ${PV}
+		Name=NVIDIA Nsight ${MY_PN^} ${PV}
-		GenericName=NVIDIA Nsight Compute
+		GenericName=NVIDIA Nsight ${MY_PN^}
-		Icon=${EPREFIX}${dir}/host/${arch_dir}/ncu-ui.png
+		Icon=${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui.png
-		Exec=env WAYLAND_DISPLAY= ${EPREFIX}${dir}/host/${arch_dir}/ncu-ui
+		Exec=env WAYLAND_DISPLAY= ${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui
-		TryExec=${EPREFIX}${dir}/host/${arch_dir}/ncu-ui
+		TryExec=${EPREFIX}${dir}/host/${arch_dirs[0]}/n${MY_PN_SHORT}-ui
 		Keywords=cuda;gpu;nvidia;nsight;
 		X-AppInstall-Keywords=cuda;gpu;nvidia;nsight;
 		X-GNOME-Keywords=cuda;gpu;nvidia;nsight;