gentoo auto-resync : 01:04:2024 - 14:13:28

3 files changed, 10 insertions, 10 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index f2b10cdacead..942de3a6fa1d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -32,6 +32,6 @@ DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BL
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
 DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043
 DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa
-EBUILD opencv-4.8.1-r1.ebuild 29072 BLAKE2B bb02548e91bf43056200443667e4695bea73912bc1b3ac41909588cc31e13b7ac4271af3e1910bd9816833df2350450273d729988cf61e4fbc89785e7a3c74c3 SHA512 3d0ce895e1e6eab2eccd5d56be44370e1aabb77796a33b40970474c4a36f5e53051b4bbb01544dc650db0ff91bb8b45f6b67ae72039dd2204c24d24d2ce9b32f
-EBUILD opencv-4.9.0.ebuild 34227 BLAKE2B 5e0eaaca285595cafe08482faf67a7f7c248acb6ccf10bde52db6aa2b63abf49bfbf355e0b2b98da3d9f1b5bf6bde85d8c43e632d938b1d7e737ad607cacfdf1 SHA512 10cf8807dfbce36996ec2565f52c1ff6e496fdee44e078fe7e534547fab611416b88e54b095029ce1adfafddaf0b04a0e5f40ea135de52258f6443c976490e64
+EBUILD opencv-4.8.1-r1.ebuild 29116 BLAKE2B 6e4d371bc1fa8eeb255e469e2a4cbe79ff86e47037dbbd47d7e6532b4a2ca3abd6c27e3bb4428c5e77069d109fe104f336a91efd0d9abb39f47d2357fb3697a7 SHA512 79af1439f643d4ff118e712201af86ee2f687e917ce845fc32219975efb8a5ad04199abd505bc9bdda210e48426d0eb6f4318e2dca8ba550c17f58fc80a70ae5
+EBUILD opencv-4.9.0.ebuild 34323 BLAKE2B 48b4a9338e7c0742c411fa67b2a93759070f5a7e4cd41c64427654a105aa103479b9c9ff65e4a51f74daf1c0e77b2554b227444da93da903f841a1a25cafac81 SHA512 1963a5313145c7a588adb9e80567b9bd0dc60a6b72495f2501207fad18b6751bf7e8143a0701cbb5e497c9796d07b45cbcc175619309d1f0ce2b9f09df27811f
 MISC metadata.xml 3718 BLAKE2B 44b00ff4bc94a19f6a1b68cfefb29ce9f1a4ee21ee999b72a258268893ede5274d863d3a6faa325e6f0522c078c6afae53c6de4c46d6ed5a083888e195f34276 SHA512 b6c2f0a27b84afcb576209a3bdc641e81323c01bcac9617086d79821e723ea3c9698e8f3c5db837d46da68e48b6d9d08bdd05977e22d58d6c7ad30fa7b965b52
diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index d183c6f8d97a..0f6ed3e6a080 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -119,7 +119,7 @@ RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
 	cudnn? ( dev-libs/cudnn:= )
 	contribdnn? ( dev-libs/flatbuffers:= )
 	contribhdf? ( sci-libs/hdf5:= )
@@ -231,7 +231,7 @@ pkg_pretend() {
 		einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
 	fi
 
-	if [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+	if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
 		local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
 		einfo "$info_message so all available architectures are build."
 	fi
@@ -566,7 +566,7 @@ multilib_src_configure() {
 	# workaround for bug 413429
 	tc-export CC CXX
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		cuda_add_sandbox -w
 
 		if [[ -n "${CUDA_GENERATION}" ]]; then
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index 8039acfa0f75..5ad9e4eabaaa 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -145,7 +145,7 @@ RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
 	cudnn? ( dev-libs/cudnn:= )
 	contribdnn? ( dev-libs/flatbuffers:= )
 	contribhdf? ( sci-libs/hdf5:= )
@@ -315,7 +315,7 @@ pkg_pretend() {
 		einfo "The CUDA architecture tuple for your device can be found at https://developer.nvidia.com/cuda-gpus."
 	fi
 
-	if [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
+	if use cuda && [[ ${MERGE_TYPE} == "buildonly" ]] && [[ -n "${CUDA_GENERATION}" || -n "${CUDA_ARCH_BIN}" ]]; then
 		local info_message="When building a binary package it's recommended to unset CUDA_GENERATION and CUDA_ARCH_BIN"
 		einfo "$info_message so all available architectures are build."
 	fi
@@ -676,7 +676,7 @@ multilib_src_configure() {
 	# workaround for bug 413429
 	tc-export CC CXX
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		cuda_add_sandbox -w
 		CUDAHOSTCXX="$(cuda_get_cuda_compiler)"
 		CUDAARCHS="$(cuda_get_host_native_arch)"
@@ -791,7 +791,7 @@ multilib_src_test() {
 		)
 	fi
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		CMAKE_SKIP_TESTS+=(
 			'CUDA_OptFlow/BroxOpticalFlow.Regression/0'
 			'CUDA_OptFlow/BroxOpticalFlow.OpticalFlowNan/0'
@@ -817,7 +817,7 @@ multilib_src_test() {
 		--test-timeout 180
 	)
 
-	if use cuda; then
+	if multilib_is_native_abi && use cuda; then
 		cuda_add_sandbox -w
 		export OPENCV_PARALLEL_BACKEND="threads"
 		export DNN_BACKEND_OPENCV="cuda"