media-libs/opencv: Updated with some new stuff from S. Suominen's ebuild

submitted to Bugzilla.

3 files changed, 23 insertions, 14 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index f5b1eaa..86f354a 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Oct 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-2.0.0.ebuild:
+  Updated ebuild based on S. Suominen's version in #289258
+
   04 Oct 2009; Aaron Mavrinac <mavrinac@gmail.com> opencv-2.0.0.ebuild:
   Added oldpython and octave USE flags for building SWIG interfaces
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 479c75c..fddc90d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,7 +4,7 @@ AUX opencv-1.1.0_pre1-stereorectify.patch 1409 RMD160 0b317df1cb2a2b61be6e673b1b
 DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
 DIST opencv-1.1pre1.tar.gz 22301291 RMD160 d105a97f211637edbbac1eb21dca2b140b1f37be SHA1 4bc4bda92a250adcb82b236161d364c059021a43 SHA256 7e4f0026e5543c38afcf8a4298b1da2bace977499f99b885c925fc784783d812
 EBUILD opencv-1.1.0_pre1.ebuild 2199 RMD160 f550df98b58a352cf06772eda1cb094cb04fe03f SHA1 598b691bb5932df387b1f7f3bb9fec05c7310400 SHA256 3bf985bc9040c62311b25ae1372fb3f71c6148b6ce215982f2c27001a89c7699
-EBUILD opencv-2.0.0.ebuild 2053 RMD160 d179598258793ad6c7ccd1625fb8bbf9c33cb6ba SHA1 86b69038bbf758a4247f299aa750403ea0548d80 SHA256 651dbce33c3d38a3fcb89f6e3c26cb8b514ac4b08e8591196544a78bf9570656
+EBUILD opencv-2.0.0.ebuild 2117 RMD160 50cddd145f65c8432b68a7ede8e210372d90a4c4 SHA1 09dada4580162a71f28b2752beecee67869b72ed SHA256 bb83ef6c8dacff33f0b6309efd8f7df920ef714938bca597dcc516df08d1f5a4
 EBUILD opencv-9999.ebuild 1656 RMD160 2d3a4827a7ee3ec37cdefd33dea90e8809bf6b67 SHA1 96b2cfba7be4b9f2739bd5e0ee05827f3736392a SHA256 09225ba786c2648a17be9d3a29316681841a171cc487dd5f5baa94f91e6bbbcf
-MISC ChangeLog 907 RMD160 902274648ecfbb6095c6f6709daab79272cb839d SHA1 9a951fa5935fcae4743a138ae16ec254b85209a2 SHA256 8d88492a5a2f23b4c03d16a0041085f650d2efdea76f790b79ac94ed2c93dc1f
+MISC ChangeLog 1039 RMD160 74d58f3e7ed4ffade4efec2f9817964e0828c43e SHA1 0f05592c2f58189b01d76e3c3d631c79e72d54da SHA256 e409b431e786377ddd6039947fd07ac25e5498c4af398e1de7e478787c902b3b
 MISC metadata.xml 758 RMD160 bdfc7cd1bf469fe5951429333659946f377faa48 SHA1 812545f8fab4fc2304006b8ebc6bfcb1155cc519 SHA256 7468b2722153f29842e40153f877e1bd980ef617f46a3f438b686b2f1a9f1dea
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index 64d7c72..826961e 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -5,15 +5,16 @@
 EAPI="2"
 inherit eutils cmake-utils
 
+MY_P="OpenCV-${PV}"
+
 DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
 HOMEPAGE="http://opencv.willowgarage.com"
-SRC_URI="mirror://sourceforge/${PN}library/OpenCV-${PV}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="debug python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg png tiff v4l xine
-zlib -oldpython -octave"
+IUSE="examples python ieee1394 ffmpeg gstreamer gtk jpeg2k jpeg mmx openmp png sse sse2 tiff v4l xine zlib -oldpython -octave -unicap"
 
 COMMON_DEPEND="python? ( >=dev-lang/python-2.5 )
 	ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 )
@@ -27,25 +28,29 @@ COMMON_DEPEND="python? ( >=dev-lang/python-2.5 )
 	xine? ( media-libs/xine-lib )
 	zlib? ( sys-libs/zlib )
 	oldpython? ( >=dev-lang/python-2.5 >=dev-lang/swig-1.3.30 )
-	octave? ( sci-mathematics/octave >=dev-lang/swig-1.3.30 )"
+	octave? ( sci-mathematics/octave >=dev-lang/swig-1.3.30 )
+	unicap? ( media-libs/unicap )"
 
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/cmake-2.6
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	openmp? ( >=sys-devel/gcc-4.2[openmp] )"
 RDEPEND="${COMMON_DEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-S="${WORKDIR}/OpenCV-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	use python && mycmakeargs="${mycmakeargs} -DBUILD_NEW_PYTHON_SUPPORT=ON" \
-			   || mycmakeargs="${mycmakeargs} -DBUILD_NEW_PYTHON_SUPPORT=OFF"
-	use oldpython && mycmakeargs="${mycmakeargs} -DBUILD_SWIG_PYTHON_SUPPORT=ON" \
-			   || mycmakeargs="${mycmakeargs} -DBUILD_SWIG_PYTHON_SUPPORT=OFF"
-	use octave && mycmakeargs="${mycmakeargs} -DBUILD_OCTAVE_SUPPORT=ON" \
-			   || mycmakeargs="${mycmakeargs} -DBUILD_OCTAVE_SUPPORT=OFF"
 	mycmakeargs="${mycmakeargs} \
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT) \
+		$(cmake-utils_use_build oldpython SWIG_PYTHON_SUPPORT) \
+		$(cmake-utils_use_build octave OCTAVE_SUPPORT) \
+		$(cmake-utils_use_build examples) \
+		$(cmake-utils_use_enable openmp) \
+		$(cmake-utils_use mmx USE_MMX) \
+		$(cmake-utils_use sse USE_SSE) \
+		$(cmake-utils_use sse2 USE_SSE2) \
 		$(cmake-utils_use_with ieee1394 1394) \
 		$(cmake-utils_use_with ffmpeg) \
 		$(cmake-utils_use_with gstreamer) \
@@ -54,6 +59,7 @@ src_configure() {
 		$(cmake-utils_use_with jpeg) \
 		$(cmake-utils_use_with png) \
 		$(cmake-utils_use_with tiff) \
+		$(cmake-utils_use_with unicap) \
 		$(cmake-utils_use_with v4l) \
 		$(cmake-utils_use_with xine)"
 	cmake-utils_src_configure