gentoo resync : 17.07.2021

3 files changed, 24 insertions, 38 deletions

diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index e3485934a6bc..c261486119d6 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -2,6 +2,6 @@ DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229
 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-sdk-10.2.89-r1.ebuild 3873 BLAKE2B 6af411229608873efcb1cab6b1883f3727b304708fdbc3bf959b307198e33f5c6c3d94b86d51fb1cb4fca5c32858e7efba3cc0a57623c8c6491ebdfa4df89dde SHA512 930fb95d6c805322ac76644846fda59aecb2ac1852686ecdd17f66d0002a42c62f20a0df30d2502d3dce7ca80ed48fe1b59185df0926b12e2ab80269c00dd681
-EBUILD nvidia-cuda-sdk-8.0.61-r1.ebuild 3825 BLAKE2B e247d6004022d6471a179ff32d1ec9ff10f0ac7b2b30b9c4ab492aa856cef29dcd104058bf48ef3351ce24d048a86017e015a1910dc183b23a46632ab4bee051 SHA512 f84a316d4cd7cd7eafe7ef313f91459b6c5940e16cc0db9ce2b431dc956d405815076c468c070481be7d6b45843a641976877cadc45c69e2b012475bb9d1276f
-EBUILD nvidia-cuda-sdk-9.2.88-r1.ebuild 3813 BLAKE2B 985ae7683e20f6e8b6b6023a8a05a5d3639899cddca2a75136edc023787612743578ca4e9ecc5f6b2b56a72b0b922d2091685ee7942eb268974f20d7c15878cf SHA512 8e60193e9d714e0e6c9cb8ac7545564191d2edd7cd35e896a2bddbd7aaad8a8d34bbf63d765fd7ddb6b284f91602327b67ec77e3c543ced3b1f09b1d5de14cce
+EBUILD nvidia-cuda-sdk-8.0.61-r1.ebuild 3696 BLAKE2B b58ad0be79f5c004a7782922256e28294078aacb7fd9f1b00b9a8d0188cafe99e786cca7851d4300390ebe49ee64e3947db8b559e4d6c61ff2b7ac084879761b SHA512 110e56b00e0fa984025d2e7f6c544ec2dde9f2c7de07d77291306b1b581c0025dd3dd1b537720f4ec52bdef1a3c059a070299b7a9a65ba4292f37a7d73477055
+EBUILD nvidia-cuda-sdk-9.2.88-r1.ebuild 3691 BLAKE2B 6b8a1e56d5c590a885255501938ee50a7e66cbb1573c33cff126b43be6cc9ca92d96d97c378ec4dfb4b3c1cc9e4b516a720d5d0e6f62bc5211ec4c50008e2399 SHA512 3996f0fe8736c586e034052228771fdf013733b4a9c76e756a16817600bee89dcf0c573f5087fbee35f4a5dde02708708edd95f7a1a23402c6d5fb54600b870b
 MISC metadata.xml 366 BLAKE2B 379204c3535fb9e98e2026ae695a62618006c42a590b13803db1990c07119a3a40e7bb4474c73f3717340987fc3ed2829dc9d6b0774103a2b4f6c0726bdf58d2 SHA512 174f0718320ba2b8c7b427d43ed2b35f781313cc97397958c5c4c49163ef6d02eae5658071238d764392905c403d13094c898f95f22e1a0360a24ae2a7d08459
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 2ff4e6cb0a85..aae721c174c0 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 45e4d209861e..60b72621e478 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