media-libs/opencv: contrib useflag added bug #557870.

Package-Manager: portage-2.2.20.1

3 files changed, 27 insertions, 24 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c6dfcf380843..afecfbda5102 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,4 @@
 DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c WHIRLPOOL 3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
+DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 94c7862604ac..97bdf9dd12a9 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<maintainer>
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<maintainer>
-		<email>amynka@gentoo.org</email>
-		<name>Amy Winston</name>
-	</maintainer>
-	<longdescription>
+<herd>kde</herd>
+<maintainer>
+	<email>dilfridge@gentoo.org</email>
+	<name>Andreas K. Huettel</name>
+</maintainer>
+<maintainer>
+	<email>amynka@gentoo.org</email>
+	<name>Amy Winston</name>
+</maintainer>
+<longdescription>
 OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
 Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
 Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
 </longdescription>
-	<use>
-		<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
-		<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
-		<flag name="ipp">Enable Intel Integrated Primitive support</flag>
-		<flag name="opencl">Add support for OpenCL</flag>
-		<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
-		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">opencvlibrary</remote-id>
-		<remote-id type="github">Itseez/opencv</remote-id>
-	</upstream>
+<use>
+	<flag name="contrib">Install user contributed scripts from opencv_contrib</flag>
+	<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+	<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+	<flag name="ipp">Enable Intel Integrated Primitive support</flag>
+	<flag name="opencl">Add support for OpenCL</flag>
+	<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
+	<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
index 5f5616762991..a528d739b9bb 100644
--- a/media-libs/opencv/opencv-3.0.0.ebuild
+++ b/media-libs/opencv/opencv-3.0.0.ebuild
@@ -12,12 +12,13 @@ HOMEPAGE="http://opencv.org"
 
 SRC_URI="
 	mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
-	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip"
+	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+	contrib? ( https://github.com/Itseez/${PN}_contrib/archive/master.zip -> ${PN}_contrib.zip )"
 
 LICENSE="BSD"
 SLOT="0/3.0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
+IUSE="contrib cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	qt4? ( !qt5 )
@@ -173,6 +174,10 @@ src_configure() {
 		mycmakeargs+=( "-DWITH_QT=OFF" )
 	fi
 
+	if use contrib; then
+		mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
+	fi
+
 	if use cuda; then
 		if [[ "$(gcc-version)" > "4.7" ]]; then
 			ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."