[gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/, media-libs/opencv/

[Tomas Chvatal]

commit:     f6882a3d2fce1d9fcfb9961bc0100cffd29522f2
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 09:58:37 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 09:58:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f6882a3d

[media-libs/opencv] Use proper libdir for pkgconfig file. Do not needlesly optimize python.

---
 .../files/2.2.0-convert_sets_to_options.patch      |   12 ++++++++++--
 .../opencv/files/2.2.0-use_system_libs.patch       |    5 ++---
 media-libs/opencv/opencv-2.2.0.ebuild              |   12 ++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
index af057fc..7da06cb 100644
--- a/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
@@ -1,6 +1,6 @@
 diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt
 --- OpenCV-2.2.0.old/CMakeLists.txt	2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0.new/CMakeLists.txt	2011-04-30 10:49:01.000000000 +0200
++++ OpenCV-2.2.0.new/CMakeLists.txt	2011-04-30 11:57:37.000000000 +0200
 @@ -13,7 +13,7 @@
  # Add these standard paths to the search paths for FIND_LIBRARY
  # to find libraries from these locations first
@@ -219,7 +219,7 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt
  
  exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
-@@ -1164,7 +1161,7 @@
+@@ -1164,14 +1161,14 @@
  # -------------------------------------------------------------------------------------------
  set(prefix      ${CMAKE_INSTALL_PREFIX})
  set(exec_prefix     "\${prefix}")
@@ -228,6 +228,14 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt
  set(includedir      "\${prefix}/include")
  set(VERSION             ${OPENCV_VERSION})
  
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
+ 
+ if(UNIX)
+-    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
++    install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ endif()
+ 
+ 
 @@ -1191,7 +1188,7 @@
  #   CPack target
  # ----------------------------------------------------------------------------

diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index 6685e92..5d22a9b 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -24,13 +24,12 @@ diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core
  define_opencv_module(core ${deps})
 diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
 --- OpenCV-2.2.0.old/modules/core/src/lapack.cpp	2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/src/lapack.cpp	2011-04-29 22:11:31.000000000 +0200
-@@ -48,7 +48,8 @@
++++ OpenCV-2.2.0/modules/core/src/lapack.cpp	2011-04-30 11:50:09.000000000 +0200
+@@ -48,7 +48,7 @@
    typedef __CLPK_integer    integer;
    typedef __CLPK_real       real;
  #else
 -  #include "clapack.h"
-+  #include <f2c.h>
 +  #include <clapack/clapack.h>
  #endif
  

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 81e1cd7..0b4465f 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
 	sys-libs/zlib
-	sci-libs/clapack
+	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
 	virtual/lapack
 	cuda? ( dev-util/nvidia-cuda-toolkit )
@@ -146,16 +146,8 @@ src_configure() {
 	mycmakeargs+=(
 		"-DCMAKE_SKIP_RPATH=ON"
 		"-DBUILD_SHARED_LIBS=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=share/doc/${PF}"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	cmake-utils_src_configure
 }
-
-pkg_postinst() {
-	use python && python_mod_optimize opencv
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup opencv
-}