commit: 84027216596e05307c8e9bcfc32d20e3ae1f3839
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Apr 16 13:30:48 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 00:37:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84027216
dev-util/nvidia-cuda-toolkit: 12.8.1 12.6.3 use edob, drop DRIVER_VERSION check
DRIVER_VERSION is non functional since it's already determined by the SRC_URI.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../nvidia-cuda-toolkit-12.6.3.ebuild | 16 ++++------------
.../nvidia-cuda-toolkit-12.8.1.ebuild | 16 ++++------------
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3.ebuild
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3.ebuild
index 76f257949e61..b399832628d9 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.6.3.ebuild
@@ -6,7 +6,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit check-reqs toolchain-funcs
+inherit check-reqs edo toolchain-funcs
inherit python-r1
DRIVER_PV="560.35.05"
@@ -78,16 +78,7 @@ cuda-toolkit_check_reqs() {
}
cuda_verify() {
- if has_version "sys-apps/grep[pcre]"; then
- local DRIVER_PV_info
- DRIVER_PV_info="$(bash "${DISTDIR}/${A}" --info | grep -oP
"cuda_${PV}.*run" | cut -d '_' -f 3)"
-
- if [[ "${DRIVER_PV}" != "${DRIVER_PV_info}" ]]; then
- die "check DRIVER_PV is ${DRIVER_PV} and should be
${DRIVER_PV_info}"
- fi
- fi
-
- # rest only works in with unpacked sources
+ # only works with unpacked sources
[[ "${EBUILD_PHASE}" != prepare ]] && return
# run self checks
@@ -148,7 +139,8 @@ src_unpack() {
"builds/nvidia_fs"
)
- bash "${DISTDIR}/${A}" --tar xf -X <(printf "%s\n" "${exclude[@]}") ||
die "failed to extract ${A}"
+ edob -m "failed to extract ${A}" \
+ bash "${DISTDIR}/${A}" --tar xf -X <(printf "%s\n"
"${exclude[@]}")
}
src_prepare() {
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1.ebuild
b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1.ebuild
index 23b0993b2eb8..a533da2dc09d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.8.1.ebuild
@@ -6,7 +6,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit check-reqs toolchain-funcs
+inherit check-reqs edo toolchain-funcs
inherit python-r1
DRIVER_PV="570.124.06"
@@ -78,16 +78,7 @@ cuda-toolkit_check_reqs() {
}
cuda_verify() {
- if has_version "sys-apps/grep[pcre]"; then
- local DRIVER_PV_info
- DRIVER_PV_info="$(bash "${DISTDIR}/${A}" --info | grep -oP
"cuda_${PV}.*run" | cut -d '_' -f 3)"
-
- if [[ "${DRIVER_PV}" != "${DRIVER_PV_info}" ]]; then
- die "check DRIVER_PV is ${DRIVER_PV} and should be
${DRIVER_PV_info}"
- fi
- fi
-
- # rest only works in with unpacked sources
+ # only works with unpacked sources
[[ "${EBUILD_PHASE}" != prepare ]] && return
# run self checks
@@ -148,7 +139,8 @@ src_unpack() {
"builds/nvidia_fs"
)
- bash "${DISTDIR}/${A}" --tar xf -X <(printf "%s\n" "${exclude[@]}") ||
die "failed to extract ${A}"
+ edob -m "failed to extract ${A}" \
+ bash "${DISTDIR}/${A}" --tar xf -X <(printf "%s\n"
"${exclude[@]}")
}
src_prepare() {
