commit: e9bb2213bb895e4a26c3e2a5a972c255d0d0af24
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 21:35:48 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 22:44:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bb2213
dev-util/nvidia-cuda-sdk: update EAPI 6 -> 7
...which should make those two old ebuilds actually usable now, seeing
as they both tried to call the long-gone cuda_pkg_setup().
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../nvidia-cuda-sdk-8.0.61-r1.ebuild | 29 ++++++++--------------
.../nvidia-cuda-sdk-9.2.88-r1.ebuild | 29 ++++++++--------------
2 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
index 2ff4e6cb0a8..aae721c174c 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cuda epatch flag-o-matic portability toolchain-funcs unpacker
versionator
+inherit cuda flag-o-matic portability toolchain-funcs unpacker
-MYD=$(get_version_component_range 1-2)
+MYD=$(ver_cut 1-2 ${PV})
DRIVER_PV="375.26"
DESCRIPTION="NVIDIA CUDA Software Development Kit"
@@ -25,11 +25,9 @@ RDEPEND="
media-libs/glew:0=
>=x11-drivers/nvidia-drivers-375.26[uvm(+)]
mpi? ( virtual/mpi )
- )"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
RESTRICT="test"
@@ -49,15 +47,10 @@ src_unpack() {
unpacker run_files/cuda-samples*run
}
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
src_prepare() {
+ cuda_src_prepare
+
export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
local file
while IFS="" read -d $'\0' -r file; do
@@ -113,12 +106,12 @@ src_install() {
if use doc; then
ebegin "Installing docs ..."
while IFS="" read -d $'\0' -r f; do
- treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+ treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
done < <(find -type f \( -name 'readme.txt' -o -name
'*.pdf' \) -print0)
while IFS="" read -d $'\0' -r f; do
- docompress -x "${f#${ED%/}}"
- done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f
-name 'readme.txt' -print0)
+ docompress -x "${f#${ED}}"
+ done < <(find "${ED}"/usr/share/doc/${PF}/ -type f
-name 'readme.txt' -print0)
eend
fi
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
index 45e4d209861..60b72621e47 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
+inherit cuda flag-o-matic portability toolchain-funcs unpacker
-MYD=$(get_version_component_range 1-2)
+MYD=$(ver_cut 1-2 ${PV})
DRIVER_PV="396.26"
DESCRIPTION="NVIDIA CUDA Software Development Kit"
@@ -25,11 +25,9 @@ RDEPEND="
media-libs/glew:0=
>=x11-drivers/nvidia-drivers-396.24[uvm(+)]
mpi? ( virtual/mpi )
- )"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
RESTRICT="test"
@@ -49,15 +47,10 @@ src_unpack() {
unpacker run_files/cuda-samples*run
}
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
src_prepare() {
+ cuda_src_prepare
+
export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
local file
while IFS="" read -d $'\0' -r file; do
@@ -113,12 +106,12 @@ src_install() {
if use doc; then
ebegin "Installing docs ..."
while IFS="" read -d $'\0' -r f; do
- treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+ treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
done < <(find -type f \( -name 'readme.txt' -o -name
'*.pdf' \) -print0)
while IFS="" read -d $'\0' -r f; do
- docompress -x "${f#${ED%/}}"
- done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f
-name 'readme.txt' -print0)
+ docompress -x "${f#${ED}}"
+ done < <(find "${ED}"/usr/share/doc/${PF}/ -type f
-name 'readme.txt' -print0)
eend
fi
