gentoo resync : 17.07.2021

9 files changed, 30 insertions, 34 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 39a695255388..cdde6d2169b4 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -8,12 +8,12 @@ DIST cuda_11.3.0_465.19.01_linux.run 3029622552 BLAKE2B ca64af09dc68b085a589b575
 DIST cuda_11.3.1_465.19.01_linux.run 3158494112 BLAKE2B 0316c6a9bf062f2503c94604b51dea9a8d19c516e304e43ccdbc79f305a242664b7f029f7b7086edd7adc37d92a3bae074f005b3be412e1361917794cb824686 SHA512 e2db8b4dcb5f6aee2c3e8a8a6848186cdcdd7cd9d5f4bfd069bd3dc2ea500797c66a4592f0e28dcbee6c3611d1f88b6fda6afcd734aa9ef45f4aa17a1527aedb
 DIST cuda_11.4.0_470.42.01_linux.run 3773273383 BLAKE2B 2e466728b6ca9d17dc3caadce13b58c8ba1464c2adeb09739f428aea96f5794c87bf84ca2b81c1019d45223ff5e519503d798032a800a370c7e41517d790f5c4 SHA512 17165102e7f64da77588fd47feeee5ce3f3151a2b482bdc005427ad77ada5d0ff5a51dcd40a27a467cd5988968469476ba90b0191aed993806d284833a08ccb1
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3989 BLAKE2B f965c3c19e7b52156d2daf3473fe563da7bf7b77516a7291735d37dc30f61bb3c6502a9d2807b7f33140e59eae2b8991e5c6881f3b4c6fa462e5093968b75c27 SHA512 611397a2c371a7aedb452d12e2acfa02dc06752b2558eedb12be852788c8050b77883a06c32b3eff131ac54a517a2c852500aa65deeaa0947a0e91f42b50954d
-EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6302 BLAKE2B 7227d9bd6cfd0232067c035d8c98f6fe2153a53db4e9a82f3a4990ed07dea8c1de129016d29de1adf0bbfe292aafe406ae0b3d4504de2ccfba00426ba5edf049 SHA512 1242e6fe1647f83a9f8c76f58f71ce1b2f0f397fefe752fb6b978152c5d798f444c2cddd333adcd768172f44bc33a684abed176e2517351d71dd427e45b218fb
-EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7301 BLAKE2B 5d52c2bffc7edba866bd76470ff0663018f22a0d276f8d1ab3022ae858ffb3c68f3746e5da830f2a6149810199f76b3ba349e3d83111b5cf2fca50d8245adbb1 SHA512 d418963abcb41ab8878cdd708bf4164d58fa4a3b54bfa7e9058a8786a5a85ae30afee2e893f1f174b5ac384b242512a294cb86f020f2b03adaca949270a11013
-EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7183 BLAKE2B 7f0680251da83372ded40804a0f59550c11fd69b2f3d97e16345c2323a8f460fe269830364b25c7894634015c7d5caad28c155a5102b03885066efda2a5b0181 SHA512 95e2644ddbf9985cd507cb3f2caf882f14a87517b62c1e5c6f1e55a3410f8144542df071a0e8851e5e716c6ffd14b67518417e7a64adff6eba35435479a31158
-EBUILD nvidia-cuda-toolkit-11.3.0-r1.ebuild 7190 BLAKE2B 74f757360a13cad90881da62e92de13a456a502d20fa967f8e45bd2dc2d20c61cfdf51b586a6e675832737a57cfb1140d269968c2912d6d2b49e15a772628c21 SHA512 78403780993009a26f84939310fe365d790d86d4fcfdf4640d452e18c9cc312a652771c61c9e83db61e1bd1c413311820fd3a02d59a4d4343d87413379c3686d
-EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7185 BLAKE2B f224322f449159d66795e97b048b124dbe89636e6f6cacb920418dd40b49425c240ad6d95a5ebe0f64bf5d8e6c5ebd059a6470872e46f64eef89dfb4ccf2eaa5 SHA512 221ec1d80ae94897ec1b207c86c555dfe859c046130dac760f2d10d535e8e038baaa99474fc9f78e08547ea18d2dae680bd4a8cbe459712ea0fa9f95faa585d8
-EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7185 BLAKE2B 45d2bc89053bebc9b867a6cd83805084fa92d54526b9e581ef668335b754f8e310e7f0538da24ac22498a2f469ff0e702864606d3458c5c4d9ccbff3bc27ad80 SHA512 cc4cb58093f4b237f1d2283d9ccc95cf7167fbf757e01f97fef0413503184100acea197e281f9a09e18ebe78c2dcfa0483596310b4aa1c11cfc75a9db1fc9169
-EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3423 BLAKE2B 3b54cc972086d15b32a839afb562accb5067be1d9c9a3438455e0d1748169ff9cd6c433510054b8cfc3c0cc95d9133dc4b84d3c18acf27b0841692e61c41de6a SHA512 db45c42e5f1b6b48ea4e77c52e7519e2a3c4de82a3439b4e69414fb85f8ae2973d0158d4c04dbbd4b803bcff026bb80fcd367a9005c6644609ae7cc09eaa26a5
+EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3925 BLAKE2B 5b193f9ba23ffe42a4a23a5e4dc0b526246286fa27c14b7d1bf41e50e24ab46c619f73e371bc1c0034ecd549839631c9f184b2ece8499150e9fa6350ed137add SHA512 30b1a97475666e9e19a1390ebac946d9c1c1b8c61fd35a44239ed751b53943eb66b4002e3b17bf9dff33d45a730db7b1b7c4d0a57cc09bac38609822eebe9fa6
+EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6238 BLAKE2B f658446f6f597fabcf7314ecd1f468ba9823047ea2344f6505672af159377902389ad430d80cc3a4bcfbfb7731824b2ecd9a7d7e5558a00dabe7a01984aae99c SHA512 d84f04a2995c7baeffa2ffae64e907af1476835c0cfc07b869d1736a7dd168d70cf49a1be139990e17d42b4ee60fc0770480f2a9d6d2bfc4d20b23c483f64c14
+EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7237 BLAKE2B d9e22b5cb70aa5306ecb5c70692b47180275172353305e6515baec6c958296429401db81ab76d35957421e1edfece4ed51c93dc7751e94a3c763cb19d92a952b SHA512 c97785b209842e30c793281d20464451c1422f058ee03dddc6f3e9e749a18d9e00ac4a8f6217f2a470ed35da20bb9993fb9122e354c94ab0b090452e673fed01
+EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7119 BLAKE2B cb904f01e369415a5386873c6da3d4d89dbad96e998c47190fc5f6eef2261df4d7bc96c508eb19031fc15a6dd7fd5340bfeb544f79f4fa1b7fdcb7109c1f764d SHA512 366005e64ce6ab58d61956a341dbf654df9876003581ef500dafb3e35c7a86af120267390365de55c91927bcb4edea08722708385be32fce0bad34cd7cc7b070
+EBUILD nvidia-cuda-toolkit-11.3.0-r1.ebuild 7126 BLAKE2B 1417c62e28d49a822e0cbbc66180fde635d7afbb84aadd082f940fc32abd99eb48986f69f790bf050e4a2ffb1b4e0cdb67b31aa49cd52ca03b4bdcbb05a2c6ea SHA512 0fb0ffd74ee3c975dba827cb113b3793e99c6a9c11f439abcdd8ffdac95f0c7ad60910926b0e1cad540fec1dacc0a1791c6a2fe9018d6b0c2a7892dea647d366
+EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7121 BLAKE2B 4e1a8edfedd8972445ec7eb413b86707f6accc3acfdda75620a4e14a36376205843cc73872b8e35845e6526cb147e64132d7c4cdc29e3ae218b559e67c3fda39 SHA512 46b28a75e4adea42d6ef06065a38aa13c4bb0acd1ff924b0e81ddf2f8b437b1e18bef85b81d3c40cb58e05934fa645ec08dbea5c2972d09bb0998f0c7a36eb4b
+EBUILD nvidia-cuda-toolkit-11.4.0.ebuild 7121 BLAKE2B 0db4166fc71c33c2bdf52c56e3ba17d502dbd20fbebb6ac65ba5887cefac8504e9af40584e3cd354fd25ee4f4c49eb39c87f04df418e2aabbda7838c937c3931 SHA512 99eea9176c4b611fa769c7be7da58afbad579eb2c732490136bd218d5aea73217fd4b4bb0259d00eb150617fbf6d4c76433cf528c6f7ea1381a1ee30227376a1
+EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3340 BLAKE2B d7d1519306fe876262beef0f711c596db067cfb50c7352157d6067dbda117c04f96bd0d6822d80c025c37a25f0d5cfa43cda9d776bef94d0206d0a07dd6279f4 SHA512 1533d650246c23e44f7392f17e0edcbc1cfb9ab3b7c9afc166ab8674410fed1f766b994956e3de914e726edd8b767372e62ba497fcc8935701b80e292c728317
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
index 21d2753a4f4b..9c782027dba0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="440.33.01"
@@ -43,7 +43,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
index 771a4554268e..c1df314703ce 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="455.32.00"
 
@@ -38,7 +38,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
index 410206bcc48f..4e8988a19e88 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="460.27.04"
 
@@ -39,7 +39,6 @@ CHECKREQS_DISK_BUILD="6800M"
 PATCHES=( "${FILESDIR}"/${P}-nsight-systems-launcher.patch )
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
index 401b2e52d4de..a4f5c24e3b10 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="460.32.03"
 
@@ -37,7 +37,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
index 426f5d471b96..3f17f8437a86 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="465.19.01"
 
@@ -37,7 +37,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
index 60cb5fa59a90..73058bb4b3cc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="465.19.01"
 
@@ -36,7 +36,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild
index 831e95860868..dc91226db343 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit check-reqs cuda toolchain-funcs unpacker
+inherit check-reqs toolchain-funcs unpacker
 
 DRIVER_PV="470.42.01"
 
@@ -36,7 +36,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="6800M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
index 2a53f8cd920d..1fc2740c1227 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-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 check-reqs cuda eutils toolchain-funcs unpacker versionator
+inherit check-reqs toolchain-funcs unpacker
 
-MYD=$(get_version_component_range 1-2)
+MYD=$(ver_cut 1-2 ${PV})
 DRIVER_PV="396.26"
 
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
@@ -18,8 +18,8 @@ KEYWORDS="-* ~amd64 ~amd64-linux"
 IUSE="debugger doc eclipse profiler"
 RESTRICT="bindist mirror"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+BDEPEND=""
+RDEPEND="
 	<sys-devel/gcc-8[cxx]
 	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
 	debugger? (
@@ -36,7 +36,6 @@ QA_PREBUILT="opt/cuda/*"
 CHECKREQS_DISK_BUILD="3500M"
 
 pkg_setup() {
-	# We don't like to run cuda_pkg_setup as it depends on us
 	check-reqs_pkg_setup
 }
 
@@ -97,7 +96,7 @@ src_install() {
 	done
 
 	dodir ${cudadir}
-	mv * "${ED%/}${cudadir}" || die
+	mv * "${ED}${cudadir}" || die
 
 	cat > "${T}"/99cuda <<- EOF || die
 		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
@@ -114,15 +113,19 @@ src_install() {
 
 pkg_postinst_check() {
 	local a b
-	a="$(version_sort $(cuda-config -s))"; a=( $a )
-	# greatest supported version
-	b="${a[${#a[@]}-1]}"
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
 
 	# if gcc and if not gcc-version is at least greatest supported
 	if tc-is-gcc && \
-		! version_is_at_least gcc-version ${b}; then
+		ver_test $(gcc-version) -gt ${b}; then
 			ewarn ""
-			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "gcc > ${b} will not work with CUDA"
 			ewarn "Make sure you set an earlier version of gcc with gcc-config"
 			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
 			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"