Version bump wrt #289258. Thanks to Aaron Mavrinac for ebuild.

(Portage version: 2.2_rc46/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 207 insertions, 1 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 5302c9ee4119..b77cabead6f7 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.13 2009/07/25 20:16:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.14 2009/10/16 14:53:42 ssuominen Exp $
+
+*opencv-2.0.0 (16 Oct 2009)
+
+  16 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> +opencv-2.0.0.ebuild,
+  +files/opencv-2.0.0-multilib.patch, metadata.xml:
+  Version bump wrt #289258. Thanks to Aaron Mavrinac for ebuild.
 
   25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   opencv-1.0.0-r1.ebuild, +files/opencv-1.0.0-gcc44.patch:
diff --git a/media-libs/opencv/files/opencv-2.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
new file mode 100644
index 000000000000..b1075aa414bd
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
@@ -0,0 +1,120 @@
+diff -ur OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.0.0.orig/3rdparty/flann/CMakeLists.txt	2009-10-01 03:21:00.000000000 +0300
++++ OpenCV-2.0.0/3rdparty/flann/CMakeLists.txt	2009-10-16 17:12:16.000000000 +0300
+@@ -86,8 +86,8 @@
+ INSTALL (
+     TARGETS flann flann_s
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib
+-    ARCHIVE DESTINATION lib
++    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
++    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+ )
+ 
+ # INSTALL (
+diff -ur OpenCV-2.0.0.orig/CMakeLists.txt OpenCV-2.0.0/CMakeLists.txt
+--- OpenCV-2.0.0.orig/CMakeLists.txt	2009-10-01 03:21:05.000000000 +0300
++++ OpenCV-2.0.0/CMakeLists.txt	2009-10-16 17:22:56.000000000 +0300
+@@ -405,8 +405,8 @@
+ 

+     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")

+     if(UNIX)

+-        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

++        set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)

++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)

+     endif()

+     if(WIN32)

+         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

+diff -ur OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.0.0.orig/interfaces/ffopencv/CMakeLists.txt	2009-10-01 03:20:57.000000000 +0300
++++ OpenCV-2.0.0/interfaces/ffopencv/CMakeLists.txt	2009-10-16 17:13:34.000000000 +0300
+@@ -33,5 +33,5 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+     )
+diff -ur OpenCV-2.0.0.orig/src/cv/CMakeLists.txt OpenCV-2.0.0/src/cv/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/cv/CMakeLists.txt	2009-10-01 03:20:58.000000000 +0300
++++ OpenCV-2.0.0/src/cv/CMakeLists.txt	2009-10-16 17:14:53.000000000 +0300
+@@ -66,8 +66,8 @@
+ 

+ install(TARGETS ${the_target}

+ 	RUNTIME DESTINATION bin COMPONENT main

+-	LIBRARY DESTINATION lib COMPONENT main

+-	ARCHIVE DESTINATION lib COMPONENT main)

++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

+ 

+ install(FILES ${lib_hdrs}

+     DESTINATION include/opencv

+diff -ur OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.0.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/cvaux/CMakeLists.txt	2009-10-01 03:20:59.000000000 +0300
++++ OpenCV-2.0.0/src/cvaux/CMakeLists.txt	2009-10-16 17:13:55.000000000 +0300
+@@ -76,8 +76,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${aux_hdrs_ext}
+         DESTINATION include/opencv
+diff -ur OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.0.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/cxcore/CMakeLists.txt	2009-10-01 03:20:59.000000000 +0300
++++ OpenCV-2.0.0/src/cxcore/CMakeLists.txt	2009-10-16 17:14:34.000000000 +0300
+@@ -66,8 +66,8 @@
+ 

+ install(TARGETS ${the_target}

+     RUNTIME DESTINATION bin COMPONENT main

+-	LIBRARY DESTINATION lib COMPONENT main

+-	ARCHIVE DESTINATION lib COMPONENT main)

++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

+ 

+ # install each module headers separately

+ install(FILES ${lib_hdrs}

+diff -ur OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt OpenCV-2.0.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/highgui/CMakeLists.txt	2009-10-01 03:20:58.000000000 +0300
++++ OpenCV-2.0.0/src/highgui/CMakeLists.txt	2009-10-16 17:15:11.000000000 +0300
+@@ -206,8 +206,8 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ 
+ install(FILES ${highgui_ext_hdrs}
+         DESTINATION include/opencv
+diff -ur OpenCV-2.0.0.orig/src/ml/CMakeLists.txt OpenCV-2.0.0/src/ml/CMakeLists.txt
+--- OpenCV-2.0.0.orig/src/ml/CMakeLists.txt	2009-10-01 03:20:59.000000000 +0300
++++ OpenCV-2.0.0/src/ml/CMakeLists.txt	2009-10-16 17:14:17.000000000 +0300
+@@ -61,8 +61,8 @@
+ 

+ install(TARGETS ${the_target}

+ 	RUNTIME DESTINATION bin COMPONENT main

+-	LIBRARY DESTINATION lib COMPONENT main

+-	ARCHIVE DESTINATION lib COMPONENT main)

++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main

++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)

+ 

+ install(FILES ${lib_hdrs}

+         DESTINATION include/opencv

+diff -ur OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt OpenCV-2.0.0/tests/cxts/CMakeLists.txt
+--- OpenCV-2.0.0.orig/tests/cxts/CMakeLists.txt	2009-10-01 03:20:56.000000000 +0300
++++ OpenCV-2.0.0/tests/cxts/CMakeLists.txt	2009-10-16 17:15:28.000000000 +0300
+@@ -63,6 +63,6 @@
+ if(WIN32)
+ install(TARGETS ${the_target}
+     RUNTIME DESTINATION bin COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main)
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
+ endif()
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 3e5bf27283cd..df7afa99a5a5 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -13,5 +13,9 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 </longdescription>
 <use>
   <flag name="demos">Install applications that demo OpenCV library functions</flag>
+  <flag name="ipp">Enable Intel Integrated Primitive support</flag>
+  <flag name="octave">Enable octave support</flag>
+  <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+  <flag name="deprecated">Enable deprecated (old) python support</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
new file mode 100644
index 000000000000..4428b54a8aee
--- /dev/null
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.1 2009/10/16 14:53:42 ssuominen Exp $
+
+EAPI=2
+inherit 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/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k
+mmx octave openmp png python sse sse2 sse3 test tiff v4l xine"
+
+RDEPEND="sys-libs/zlib
+	ipp? ( sci-libs/ipp )
+	python? ( >=dev-lang/python-2.5
+		deprecated? ( dev-lang/swig ) )
+	ieee1394? ( sys-libs/libraw1394
+		media-libs/libdc1394:2 )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	gstreamer? ( media-libs/gstreamer )
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg2k? ( media-libs/jasper )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	tiff? ( media-libs/tiff )
+	xine? ( media-libs/xine-lib )
+	octave? ( sci-mathematics/octave
+		dev-lang/swig )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_enable openmp)
+		$(cmake-utils_use ipp USE_IPP)
+		$(cmake-utils_use mmx USE_MMX)
+		-DUSE_O3=OFF
+		-DUSE_OMIT_FRAME_POINTER=OFF
+		$(cmake-utils_use sse USE_SSE)
+		$(cmake-utils_use sse2 USE_SSE2)
+		$(cmake-utils_use sse3 USE_SSE3)
+		$(cmake-utils_use_with ieee1394 1394)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with gstreamer)
+		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with jpeg2k jasper)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with tiff)
+		-DWITH_UNICAP=OFF
+		$(cmake-utils_use_with v4l)
+		$(cmake-utils_use_with xine)"
+
+	if use python; then
+		mycmakeargs="${mycmakeargs}
+			$(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)"
+	fi
+
+	cmake-utils_src_configure
+}