From 498f5a340a9854f33e4bb2e465878b648def5b57 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Jun 2020 15:42:02 +1000
Subject: [PATCH] OpenCV: specify python version

---
 media-libs/opencv/opencv-3.4.3.recipe | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/media-libs/opencv/opencv-3.4.3.recipe b/media-libs/opencv/opencv-3.4.3.recipe
index de0b029fe..b9b53821d 100644
--- a/media-libs/opencv/opencv-3.4.3.recipe
+++ b/media-libs/opencv/opencv-3.4.3.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2000-2016, Intel Corporation
 	2015-2016, OpenCV Foundation
 	2015-2016, Itseez Inc."
 LICENSE="BSD (3-clause)"
-REVISION="10"
+REVISION="11"
 SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="opencv-$portVersion.tar.gz"
 CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec"
@@ -17,7 +17,7 @@ SOURCE_URI_2="https://github.com/opencv/opencv_contrib/archive/$portVersion.tar.
 SOURCE_FILENAME_2="opencv_contrib-$portVersion.tar.gz"
 CHECKSUM_SHA256_2="6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636"
 
-ARCHITECTURES="?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -30,6 +30,8 @@ portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%.*}"
 
+pythonVersion="3.7"
+
 PROVIDES="
 	opencv$secondaryArchSuffix = $portVersionCompat
 	lib:libopencv_aruco$secondaryArchSuffix = $libVersionCompat
@@ -236,7 +238,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:doxygen
 #	cmd:f2py2
-	cmd:f2py3
+	cmd:f2py${pythonVersion}
 	cmd:gcc$secondaryArchSuffix
 #	cmd:javac
 #	cmd:jni
@@ -245,7 +247,7 @@ BUILD_PREREQUIRES="
 #	cmd:matlab # maybe later
 	cmd:pkg_config$secondaryArchSuffix
 #	cmd:python2
-	cmd:python3
+	cmd:python${pythonVersion}
 	"
 
 defineDebugInfoPackage opencv$secondaryArchSuffix \
@@ -313,7 +315,8 @@ INSTALL()
 
 	if [ -n "$secondaryArchSuffix" ]; then
 		mv $prefix/lib/*.so* $libDir
-		mv $prefix/lib/{pkgconfig,python3.7} $libDir
+		mv $prefix/lib/pkgconfig $libDir
+		mv $prefix/lib/python* $libDir
 	fi
 
 	prepareInstalledDevelLibs libopencv_aruco \