OpenCV: enable for secondary arch

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="9"
+REVISION="10"
 SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="opencv-$portVersion.tar.gz"
 CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec"
@@ -18,7 +18,7 @@ SOURCE_FILENAME_2="opencv_contrib-$portVersion.tar.gz"
 CHECKSUM_SHA256_2="6dfb51326f3dfeb659128df952edecd45683626a965aa4a8e1e9c970c40fb636"
 
 ARCHITECTURES="?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
@@ -235,7 +235,7 @@ BUILD_PREREQUIRES="
 #	cmd:ant
 	cmd:cmake
 	cmd:doxygen
-	cmd:f2py2
+#	cmd:f2py2
 	cmd:f2py3
 	cmd:gcc$secondaryArchSuffix
 #	cmd:javac
@@ -244,7 +244,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 #	cmd:matlab # maybe later
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python2
+#	cmd:python2
 	cmd:python3
 	"
 
@@ -303,14 +303,19 @@ INSTALL()
 
 	make install
 
-	mkdir -p $developDir $dataDir
-	mv $prefix/include $includeDir
+	mkdir -p $developDir $dataDir $includeDir
+	mv $prefix/include/* $includeDir
 	mv $prefix/share/* $dataDir
-	rmdir $prefix/share
+	rmdir $prefix/{share,include}
 
 	mkdir -p $libDir/cmake/OpenCV
 	mv $dataDir/OpenCV/*.cmake $libDir/cmake/OpenCV/
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		mv $prefix/lib/*.so* $libDir
+		mv $prefix/lib/{pkgconfig,python3.7} $libDir
+	fi
+
 	prepareInstalledDevelLibs libopencv_aruco \
 		libopencv_bgsegm \
 		libopencv_bioinspired \
@@ -371,6 +376,8 @@ INSTALL()
 	# fixCmake
 	sed -i 's,\/include,/'${relativeIncludeDir}',g' \
 		$libDir/cmake/OpenCV/OpenCVConfig.cmake
+	sed -i 's|set(OpenCV_INCLUDE_DIRS.*|set(OpenCV_INCLUDE_DIRS "'${includeDir}'" "'${includeDir}'/opencv")|g' \
+		$libDir/cmake/OpenCV/OpenCVConfig.cmake
 	sed -i 's|/\.\./\.\./|&../|g' \
 		$libDir/cmake/OpenCV/OpenCVConfig.cmake
 	sed -i 's,\/lib\/,\/,g' \
@@ -383,7 +390,7 @@ INSTALL()
 
 	# tools package
 	packageEntries tools \
-		$binDir
+		$prefix/bin
 }
 
 TEST()