Version bump, thanks to Andreas Sturmlechner for his help

(Portage version: 2.1.10.34/cvs/Linux x86_64)

5 files changed, 508 insertions, 1 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index f61a6a797b5b..25aabbaaf8ed 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.56 2011/10/15 23:17:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.57 2011/11/13 14:27:17 dilfridge Exp $
+
+*opencv-2.3.1a (13 Nov 2011)
+
+  13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.3.1a.ebuild,
+  +files/opencv-2.3.1a-convert_sets_to_options.patch,
+  +files/opencv-2.3.1a-libsuffix.patch, +files/opencv-2.3.1a-nocaps.patch:
+  Version bump, thanks to Andreas Sturmlechner for his help
 
   15 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Remove description for USE flags "deprecated" and "octave"
diff --git a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
new file mode 100644
index 000000000000..174a1d68fdd1
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
@@ -0,0 +1,217 @@
+diff -ruN OpenCV-2.3.1-0-vanilla/CMakeLists.txt OpenCV-2.3.1-2-options/CMakeLists.txt
+--- OpenCV-2.3.1-0-vanilla/CMakeLists.txt	2011-09-12 20:45:38.000000000 +0200
++++ OpenCV-2.3.1-2-options/CMakeLists.txt	2011-11-13 14:11:45.000000000 +0100
+@@ -72,13 +72,13 @@
+ # Build static or dynamic libs?
+ # Default: dynamic libraries
+ # ----------------------------------------------------------------------------
+-set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
++OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+ 
+ # ----------------------------------------------------------------------------
+ # Include debug info into debug libs?
+ # Default: yes
+ # ----------------------------------------------------------------------------
+-set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
++OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
+ 
+ # ----------------------------------------------------------------------------
+ #  Get actual OpenCV version number from sources
+@@ -318,23 +318,23 @@
+ 
+ # Build/install (or not) some apps:
+ # ===================================================
+-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
+-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
+-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
++option(BUILD_EXAMPLES "Build all examples" OFF)
++option(INSTALL_C_EXAMPLES "Install C examples" OFF)
++option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
+ if(ANDROID)
+-    set(INSTALL_ANDROID_EXAMPLES OFF CACHE BOOL "Install Android examples")
++    option(INSTALL_ANDROID_EXAMPLES "Install Android examples" OFF)
+ endif()
+ 
+ # Build tests:
+ # ===================================================
+-set(BUILD_TESTS ON CACHE BOOL "Build tests")
++option(BUILD_TESTS "Build tests" ON)
+ 
+ # Build 3rdparty libraries under unix
+ # ===================================================
+ if(WIN32)
+-    set(OPENCV_BUILD_3RDPARTY_LIBS TRUE  CACHE BOOL "Build 3rd party libraries")
++    option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
+ else()
+-    set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
++    option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
+ endif()
+ 
+ include(OpenCVPCHSupport.cmake REQUIRED)
+@@ -344,7 +344,7 @@
+ endif()
+ 
+ if(PCHSupport_FOUND)
+-    SET(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Use precompiled headers")
++    option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
+ else()
+     SET(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Use precompiled headers" FORCE)
+ endif()
+@@ -356,8 +356,8 @@
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
+-    set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
++    option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
++    option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
+ 
+     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64.*|x86_64.*)
+         set(X86_64 1)
+@@ -376,59 +376,59 @@
+         #ELSE()
+         #    SET(_USE_FAST_MATH ON)
+         #ENDIF()
+-        set(USE_FAST_MATH ${_USE_FAST_MATH} CACHE BOOL "Enable -ffast-math (not recommended for GCC 4.6.x)")
+-        set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
+-        set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
+-        set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
+-        set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
+-        set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
+-        set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
++        option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
++        option(ENABLE_SSE "Enable SSE instructions" ON)
++        option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
++        option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
++        option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
++        option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
++        option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
+     endif()
+ endif()
+ 
+ if(MSVC)
+-    set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
+-    set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
++    option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
++    option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
+     if(CMAKE_C_COMPILER MATCHES "icc")
+-        set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
+-        set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
++        option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
++        option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
+     endif()
+ endif()
+ 
+ # allow fine grained control over which libraries not to link, even if
+ # they are available on the system
+ # ====================================================================
+-set(WITH_PNG ON CACHE BOOL "Include PNG support")
+-set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
+-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
+-set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
+-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
++option(WITH_PNG "Include PNG support" ON)
++option(WITH_JPEG "Include JPEG support" ON)
++option(WITH_JASPER "Include JPEG2K support" ON)
++option(WITH_TIFF "Include TIFF support" ON)
++option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
+ 
+ if(UNIX)
+-    set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
++    option(WITH_FFMPEG "Include FFMPEG support" ON)
+     if(NOT APPLE)
+-        set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
+-        set(WITH_GTK ON CACHE BOOL "Include GTK support")
+-        set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
+-        set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
+-        set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
++        option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
++        option(WITH_GTK "Include GTK support" ON)
++        option(WITH_GSTREAMER "Include Gstreamer support" ON)
++        option(WITH_V4L "Include Video 4 Linux support" ON)
++        option(WITH_XINE "Include Xine support (GPL)" OFF)
+     endif()
+-    set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
+-    set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
++    option(WITH_PVAPI "Include Prosilica GigE support" ON)
++    option(WITH_1394 "Include IEEE1394 support" ON)
+ endif()
+ 
+ if(APPLE)
+-    set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
+-    set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
++    option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
++    option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
+ endif()
+ 
+-set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
+-set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
+-set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
+-set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
+-
+-set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
+-set(WITH_XIMEA OFF CACHE BOOL "Include XIMEA cameras support")
++option(WITH_TBB "Include TBB support" OFF)
++option(WITH_IPP "Include Intel IPP support" OFF)
++option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
++option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
++ 
++option(WITH_OPENNI "Include OpenNI support" OFF)
++option(WITH_XIMEA "Include XIMEA cameras support" OFF)
+ 
+ # ===================================================
+ # Macros that checks if module have been installed.
+@@ -626,13 +626,13 @@
+     include(OpenCVFindOpenEXR.cmake)
+ endif()
+ 
+-set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
++option(BUILD_DOCS "Build OpenCV Documentation" ON)
+ 
+ if(BUILD_DOCS)
+   include(OpenCVFindLATEX.cmake REQUIRED)
+ endif()
+ 
+-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
+ 
+ if (WIN32)
+     if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+@@ -836,8 +836,8 @@
+ #YV
+ ############################### QT ################################
+ 
+-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
+-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
++option(WITH_QT "Build with Qt Backend support" OFF)
++option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
+ 
+ set(HAVE_QT 0)
+ set(HAVE_QT_OPENGL 0)
+@@ -1054,7 +1054,7 @@
+ ################## Extra HighGUI libs on Windows ###################
+ 
+ if(WIN32)
+-    set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
++    option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
+     set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
+ 
+     if(WITH_VIDEOINPUT)
+@@ -1123,7 +1123,7 @@
+ #           Set the maximum level of warnings:
+ # ----------------------------------------------------------------------------
+ # Should be set to true for development
+-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
++option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
+ if (WIN32 AND ${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)")
+     set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "")
+ endif()
+@@ -1494,7 +1494,7 @@
+ #-----------------------------------
+ # Source package:
+ #-----------------------------------
+-set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
++option(BUILD_PACKAGE "Build a installer with the SDK" ON)
+ 
+ if(BUILD_PACKAGE)
+     set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
diff --git a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
new file mode 100644
index 000000000000..6481ee869a28
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
@@ -0,0 +1,33 @@
+diff -ruN OpenCV-2.3.1-2-options/CMakeLists.txt OpenCV-2.3.1-3-suffix/CMakeLists.txt
+--- OpenCV-2.3.1-2-options/CMakeLists.txt	2011-11-13 14:11:45.000000000 +0100
++++ OpenCV-2.3.1-3-suffix/CMakeLists.txt	2011-11-13 14:33:26.000000000 +0100
+@@ -18,7 +18,7 @@
+     # Add these standard paths to the search paths for FIND_LIBRARY
+     # to find libraries from these locations first
+     if(UNIX)
+-        set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
++        set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
+     endif()
+ 
+     # it _must_ go before PROJECT(OpenCV) in order to work
+@@ -117,7 +117,7 @@
+ 
+ # SUBDIRECTORIES:
+ # Save libs and executables in the same place
+-set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Output directory for libraries" )
++set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}" CACHE PATH "Output directory for libraries" )
+ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
+ 
+ if(ANDROID OR WIN32)
+@@ -665,9 +665,9 @@
+                     OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
+                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+     if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+     else() #debian based assumed, install to the dist-packages.
+-        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++        set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+     endif()
+ endif()
+ if(CMAKE_HOST_WIN32)
diff --git a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
new file mode 100644
index 000000000000..23abeb2ffbb9
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
@@ -0,0 +1,83 @@
+diff -ruN OpenCV-2.3.1-3-suffix/CMakeLists.txt OpenCV-2.3.1-4-caps/CMakeLists.txt
+--- OpenCV-2.3.1-3-suffix/CMakeLists.txt	2011-11-13 14:33:26.000000000 +0100
++++ OpenCV-2.3.1-4-caps/CMakeLists.txt	2011-11-13 14:37:04.000000000 +0100
+@@ -123,9 +123,9 @@
+ if(ANDROID OR WIN32)
+     set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(OPENCV_MANGLED_INSTALL_PATHS)
+-    set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++    set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
+ else()
+-    set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++    set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/)
+ endif()
+ 
+ if(ANDROID)
+@@ -1347,12 +1347,12 @@
+ set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
+ if(ANDROID)
+     set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/libs/\${ARMEABI_NDK_NAME}\"")
+-    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
++    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/libs/\${ARMEABI_NDK_NAME}\"")
+ else()
+     set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
+-    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+     if(OPENCV_MANGLED_INSTALL_PATHS)
+-      set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/OpenCV-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++      set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_INSTALL_PATH}/share/opencv-${OPENCV_VERSION}/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+     endif()
+ endif()
+ 
+@@ -1367,16 +1367,16 @@
+   #                <prefix>/(share|lib)/<name>*/                           (U)
+   #                <prefix>/(share|lib)/<name>*/(cmake|CMake)/             (U)
+   if(OPENCV_MANGLED_INSTALL_PATHS)
+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-${OPENCV_VERSION}/)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv-${OPENCV_VERSION}/)
+   else()
+-    install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/OpenCV/)
+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/)
++    install(FILES "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" DESTINATION share/opencv/)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake DESTINATION share/opencv/)
+   endif()
+ endif()
+ 
+ if(ANDROID)
+-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/OpenCV)
++    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/android/android.toolchain.cmake" DESTINATION share/opencv)
+ endif()
+ 
+ # --------------------------------------------------------------------------------------------
+@@ -1386,7 +1386,7 @@
+     set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"")
+     set(CMAKE_OPENCV2_INCLUDE_DIRS_CONFIGCMAKE "")
+     set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/${OPENCV_LIB_INSTALL_PATH}\"")
+-    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
++    set(CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}\"")
+ 
+     exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"" OUTPUT_VARIABLE RET_VAL)
+     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+@@ -1439,7 +1439,7 @@
+     set(CMAKE_LIBS_DIR_CONFIGCMAKE "\$(OPENCV_THIS_DIR)/../..")
+ 
+     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" IMMEDIATE @ONLY)
+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/OpenCV/)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION share/opencv/)
+ endif(ANDROID)
+ 
+ # --------------------------------------------------------------------------------------------
+diff -ruN OpenCV-2.3.1-3-suffix/data/CMakeLists.txt OpenCV-2.3.1-4-caps/data/CMakeLists.txt
+--- OpenCV-2.3.1-3-suffix/data/CMakeLists.txt	2011-09-12 20:45:36.000000000 +0200
++++ OpenCV-2.3.1-4-caps/data/CMakeLists.txt	2011-11-13 14:35:08.000000000 +0100
+@@ -2,6 +2,6 @@
+ file(GLOB LBP_CASCADES lbpcascades/*.xml)
+ 
+ if(NOT WIN32)
+-install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT main)
++    install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++    install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
+ endif()
diff --git a/media-libs/opencv/opencv-2.3.1a.ebuild b/media-libs/opencv/opencv-2.3.1a.ebuild
new file mode 100644
index 000000000000..b4eb279e8de7
--- /dev/null
+++ b/media-libs/opencv/opencv-2.3.1a.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.1a.ebuild,v 1.1 2011/11/13 14:27:17 dilfridge Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils fortran-2 python
+
+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="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 tiff v4l xine"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+	eigen? ( dev-cpp/eigen:2 )
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? (
+		media-libs/gstreamer
+		media-libs/gst-plugins-base
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	ipp? ( sci-libs/ipp )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	python? ( dev-python/numpy )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-test:4
+		opengl? ( x11-libs/qt-opengl:4 )
+	)
+	tiff? ( media-libs/tiff )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )
+	dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-numpy.patch"
+	"${FILESDIR}/${P}-convert_sets_to_options.patch"
+	"${FILESDIR}/${P}-libsuffix.patch"
+	"${FILESDIR}/${P}-nocaps.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P/2.3.1a/2.3.1}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(cmake-utils_use_enable sse SSE)
+		$(cmake-utils_use_enable sse2 SSE2)
+		$(cmake-utils_use_enable sse3 SSE3)
+		$(cmake-utils_use_enable ssse3 SSSE3)
+		$(cmake-utils_use_with ipp)
+		$(cmake-utils_use_with ieee1394 1394)
+		$(cmake-utils_use_with eigen)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with gstreamer)
+		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4 QT)
+		$(cmake-utils_use_with opengl QT_OPENGL)
+		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_with v4l V4L)
+		$(cmake-utils_use_with xine)
+	)
+
+	if use cuda; then
+		if [ "$(gcc-version)" > "4.4" ]; then
+			ewarn "CUDA and >=sys-devel/gcc-4.5 do not play well together. Disabling CUDA support."
+			mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		else
+			mycmakeargs+=( "-DWITH_CUDA=ON" )
+		fi
+	else
+		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+	fi
+
+	if use python && use examples; then
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+	else
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+	fi
+
+	# things we want to be hard off or not yet figured out
+	# unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
+	# openni: ???
+	mycmakeargs+=(
+		"-DUSE_OMIT_FRAME_POINTER=OFF"
+		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+		"-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+		"-DBUILD_LATEX_DOCS=OFF"
+		"-DENABLE_POWERPC=OFF"
+		"-DBUILD_PACKAGE=OFF"
+		"-DENABLE_PROFILING=OFF"
+		"-DUSE_O2=OFF"
+		"-DUSE_O3=OFF"
+		"-DUSE_FAST_MATH=OFF"
+		"-DENABLE_SSE41=OFF"
+		"-DENABLE_SSE42=OFF"
+		"-DWITH_PVAPI=OFF"
+		"-DWITH_UNICAP=OFF"
+		"-DWITH_TBB=OFF"
+		"-DWITH_OPENNI=OFF"
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# hardcode cuda paths
+	mycmakeargs+=(
+		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+	)
+
+	cmake-utils_src_configure
+}