[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/

[Michał Górny]

commit:     18ba8e8a0e09ab901aba054af8f8d2743227febf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 09:54:33 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 13:20:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ba8e8a

media-libs/opencv: Fix automagic dep on tesseract

 media-libs/opencv/opencv-3.1.0-r8.ebuild | 10 ++++++++++
 media-libs/opencv/opencv-3.2.0-r3.ebuild | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/media-libs/opencv/opencv-3.1.0-r8.ebuild b/media-libs/opencv/opencv-3.1.0-r8.ebuild
index a4f6ffd7f96..75af0b42c87 100644
--- a/media-libs/opencv/opencv-3.1.0-r8.ebuild
+++ b/media-libs/opencv/opencv-3.1.0-r8.ebuild
@@ -244,6 +244,16 @@ multilib_src_configure() {
 			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
 			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
 		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
 	fi
 
 	# workaround for bug 413429

diff --git a/media-libs/opencv/opencv-3.2.0-r3.ebuild b/media-libs/opencv/opencv-3.2.0-r3.ebuild
index ea277d363e9..57e9db2784e 100644
--- a/media-libs/opencv/opencv-3.2.0-r3.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r3.ebuild
@@ -286,6 +286,16 @@ multilib_src_configure() {
 			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
 			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
 		)
+
+		if multilib_is_native_abi; then
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
+			)
+		else
+			GLOBALCMAKEARGS+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
+			)
+		fi
 	fi
 
 	# workaround for bug 413429