[gentoo-commits] dev/dilfridge:master commit in: media-libs/opencv/files/, media-libs/opencv/

[Andreas Hüttel]

commit:     33fc606ccef362e3712ac3ac41ce1cbd10e2203b
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 21:16:44 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 21:16:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=33fc606c

[media-libs/opencv] Resync with main tree

(Portage version: 2.1.10.5/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7887F787)

---
 media-libs/opencv/ChangeLog                        |    7 +
 media-libs/opencv/Manifest                         |   38 ++++---
 .../opencv/files/opencv-2.0.0-libpng14.patch       |   13 ++
 media-libs/opencv/files/opencv-2.1.0-mmap.patch    |   14 +++
 .../opencv/files/opencv-2.1.0-multilib.patch       |  110 ++++++++++++++++++
 .../opencv/files/opencv-2.2.0-findblas.patch       |   36 ++++++
 media-libs/opencv/opencv-2.1.0.ebuild              |  117 ++++++++++++++++++++
 media-libs/opencv/opencv-2.2.0-r10.ebuild          |   10 +-
 media-libs/opencv/opencv-2.2.0.ebuild              |    9 +-
 9 files changed, 330 insertions(+), 24 deletions(-)

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 715cabb..00fc18c 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.34 2011/05/11 20:10:16 dilfridge Exp $
 
+  13 Jul 2011; Andreas K. Huettel <dilfridge@g.o>
+  +files/opencv-2.0.0-libpng14.patch, +opencv-2.1.0.ebuild,
+  +files/opencv-2.1.0-mmap.patch, +files/opencv-2.1.0-multilib.patch,
+  opencv-2.2.0.ebuild, opencv-2.2.0-r10.ebuild,
+  +files/opencv-2.2.0-findblas.patch:
+  Resync with main tree
+
   15 May 2011; Andreas K. Huettel <dilfridge@g.o> +opencv-2.2.0.ebuild,
   +opencv-2.2.0-r10.ebuild, -opencv-2.2.0-r11.ebuild:
   Resync with tree

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index bb80aac..a5d2348 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
+AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
+AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6
 AUX opencv-2.2.0-convert_sets_to_options.patch 16756 RMD160 0fa3fb99eafcf31cdcaa8dc8296b7904268449f8 SHA1 64158ca0539f742fbb419ccf332ba941c7d5a17e SHA256 b673edaa3de01d7e858205435ab663bf17ccd8aa5c6811a3bb3895f041693df2
 AUX opencv-2.2.0-ffmpeg01.patch 3464 RMD160 13fcca8090fd84b9b0cfc4c7d05656bfe5bba33c SHA1 5af4e27004603e3da8abb0d4c21565146a99a742 SHA256 a60950322b373f25c47c6681e241cb77d2fd7499dcdbbad18d7e5472ce01bb4e
 AUX opencv-2.2.0-ffmpeg02.patch 1764 RMD160 8d755cc29bdee4ee239e178d42d8ae980df4b6e7 SHA1 14cdcc5bf9b11dcd614f3a9296531cd287e6f6fa SHA256 9e293a66e0b914fba279fc53c0c483763460aeca7ee34ffcbb70c616ddccd8d2
+AUX opencv-2.2.0-findblas.patch 1381 RMD160 117b3774ce42e73fc375da79b653c6bf69114be9 SHA1 5e34a74d79b3ec8f53759e3120ff85f054e05e51 SHA256 16f69a37283fb3e8ec3ab5435edd0a800e506c1f25997ecbbd4f7a02fa99aa8c
 AUX opencv-2.2.0-findnpp.patch 3783 RMD160 90d0ad6f5163c26014365539cdae234dd949f711 SHA1 a8d289f12886dc90d7048bf0011a8b5e962deb83 SHA256 9fcf34f285db106ba282aeaa955d6d8e0f0e9f410ebe6410eb49ab2cc705b439
 AUX opencv-2.2.0-fortran.patch 424 RMD160 ca1d46937cf80bc898f324575705d42af18247cf SHA1 393f4d2bb9daa257a259e54d196af977facb7506 SHA256 4c2f2fbcb9d6d3c5418813ed14c11bac1708b04b8af7f1803fb260885063ca76
 AUX opencv-2.2.0-gcc46.patch 400 RMD160 e440ca115de06fe8d3aac012ce77a008ce0184ed SHA1 44d15398e571defc2e7971f5e90f934f645d9281 SHA256 e1c86c20725ac47592ed426efa63efaaf3412913bd78a0d39ab1a3efc28b4f25
@@ -12,25 +16,27 @@ AUX opencv-2.2.0-numpy.patch 632 RMD160 8652c618eebab2769952f47c8cceed33027079e1
 AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
 AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de
 AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
+DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
-EBUILD opencv-2.2.0-r10.ebuild 4395 RMD160 3a6f2fc6752ec38e83da63e7b3b63f67810801e6 SHA1 203ffcc7dfd013c963f494515e0cda12f334f133 SHA256 b301eb7e0e4b3cb2e738c583a326f8a3192ecac1a70139cee07ee4de9ec92da2
-EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
-MISC ChangeLog 6777 RMD160 99152d0a8c39bfdc2172815430e389f7b10ad7ee SHA1 fff5bfa89df9ffd63715bd7c0adc2ed5e64dc723 SHA256 b5b4b430a0ab2b31b07a5ae006dfb171558962f9eeca2f9b1b2a98caaf189b4f
+EBUILD opencv-2.1.0.ebuild 2965 RMD160 cda05fb69589c70f445874641c70dc1024f0f9aa SHA1 be6a6e5fe5ec61892b8c1a67ca6cc5eb4c885660 SHA256 bdc6c2d8d3ae25424810d2f05e75dd3d8c3769c2e4dec0e62655fbbdc039e12f
+EBUILD opencv-2.2.0-r10.ebuild 4453 RMD160 d55f2d304dc1319fec2b8bd9626e88dc6dc6f308 SHA1 c1e6a6f06c5f9591448ac488939f85257f179a87 SHA256 4c351565fdd778611559a0f4413922dbc44503ece7eb3f6a4e9cb41ff464c2f7
+EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
+MISC ChangeLog 7075 RMD160 aa860340132e7d913e03157c060250d9b3a3148d SHA1 e45dbb57c961f4a8db65b8e4535a0908ab84056d SHA256 ff428df8faaf80c5839b35bfa144103b21d0f3c511b51377ef841878ac512248
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN0AezAAoJENwGBM22xffeaeQP/2F4KDaJ729a9HyPRqOu+CN+
-vFgQCcgSOuIPb2GzpHRGS0Y9BXxZ7jhchGKqqfsTxp+P2cVmXsTonyYwwrcUTKNR
-3uKJvda1EodZb+1ySZSqsQcrejX1ekzHDn3kbRyj6dPvY4rt6rDVy15PhsLmlOqn
-8kCclAKzUXISyTLVayNHxHsNjutU68XMPxUwvEJaOTY5+ivYw5y6qkDw3NSlRRhC
-e80TIKc3PujpUAJcq9llVWi4xgYz7Ic7FKPEpwxz2TKUrij7kjvAzqcn/FVHuJ12
-aOCMyvqDlILhOP+rmSsBvyzvEGUL5yl5Bn8nl1nXzNyv5XzaJ52ADsNC8R+HKq7y
-AuTjw1vTIsla3lLxn4VyXrVX8Uktc6DcCNtwSfX3lh1+5clwEVfJleyBHhH0UHLM
-seDSv9Ipj8RLfPUocubl31z5WhFiMK75kMO2EZ0InxTLxyvC/XcleIOlEK8K0vtG
-0rPS+qqnDnwLoQSSnH4qSx7EkbURAgTwOgqg6wrGIurU93Bul+cn10gDXvoEDpul
-BNPXbZdzPmKB6Gxw3xbh19A8aGaKqH8dOovY95OjHuUG5hWg/i19eR39dh2Em6mK
-58KvyfDzbVtm4ROfWmeNa+D0OCFqjA5FqzIkLVozdfPWqmbTmwtNEpvck0EQ1sv7
-h6hzL67BAHcvndXJJdw+
-=Wonr
+iQIcBAEBCgAGBQJOHgs7AAoJEEb+UGWnxTyHhB4P/jD8dPeMSGX08znHXgrJolYr
+cjlYJ3lc9jzW7baD/qOO/8GEMPAMuPh/AYdShTFEJAi0psi9Bem9m38EZ+TjKjd1
+B44VtB83/sk+hApJzosvCNBrxZuR8g5OTTfbqvV8p2Z9DUIl/+TSBehkAQarVq+J
+8CwEsdO/1iFGn2EpsySFwbYfd/ejI2evDzR92BB2i/DV7/RhRpgojnfbnppM+z0J
+CiN8KCiXyL2wAwWb0MceI5y4Tvetx/uENH7xRifIiSjv8RxjZ+O/3kcoPHW7wKJD
+tRqV5Mk2T6P6tctl4xk/u53ftX7gF3b/P5d4EgEiDsYhjqkaG11jK9vxYKVty1Xw
+hiCSjHmwNreyOIhK3+cZ4aDQVlZv5BdtudmxL218ty+6kBxY8TDqHuMQ+Xp9aL9I
+vXhlc1myp+rJPk5z+3OsNDs3iYcMj/ujrLCkKP38iB+dIlSL69Jjd4a1o2YB82mJ
+S0Z7Z9MjBSfLaiQHKosu7ipNnX5Jk40tgUo+pLAyDmHLv6kvMHeDlA/pNuEV0qAx
++jR89lqon9qiAws8wrFwBG4k4Kp1/Lh80OBXe7Eadtkmk3g+jK+cU64ZnGDtiTGN
++3XgQ0kCDPcVJfuTHzkH6W7DjVYwX79IP/jjcjPgGQT4MxmNkQiMRP3LZDk6J8i3
+0L+n2CnzXqdIZDKGt3CA
+=4StP
 -----END PGP SIGNATURE-----

diff --git a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
new file mode 100644
index 0000000..56f7a4e
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
@@ -0,0 +1,13 @@
+http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
+
+--- src/highgui/grfmt_png.cpp
++++ src/highgui/grfmt_png.cpp
+@@ -223,7 +223,7 @@
+                 png_set_palette_to_rgb( png_ptr );
+ 
+             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
+-                png_set_gray_1_2_4_to_8( png_ptr );
++                png_set_expand_gray_1_2_4_to_8( png_ptr );
+ 
+             if( CV_MAT_CN(m_type) > 1 && color )
+                 png_set_bgr( png_ptr ); // convert RGB to BGR

diff --git a/media-libs/opencv/files/opencv-2.1.0-mmap.patch b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
new file mode 100644
index 0000000..b7bbc9b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-mmap.patch
@@ -0,0 +1,14 @@
+http://code.ros.org/trac/opencv/ticket/141
+http://bugs.gentoo.org/313649
+
+--- src/highgui/cvcap_libv4l.cpp
++++ src/highgui/cvcap_libv4l.cpp
+@@ -782,7 +782,7 @@
+ 
+        capture->buffers[n_buffers].length = buf.length;
+        capture->buffers[n_buffers].start =
+-         mmap (NULL /* start anywhere */,
++         v4l2_mmap (NULL /* start anywhere */,
+                buf.length,
+                PROT_READ | PROT_WRITE /* required */,
+                MAP_SHARED /* recommended */,

diff --git a/media-libs/opencv/files/opencv-2.1.0-multilib.patch b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
new file mode 100644
index 0000000..752ca6f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.1.0-multilib.patch
@@ -0,0 +1,110 @@
+diff -ur OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt
+--- OpenCV-2.1.0.orig/3rdparty/flann/CMakeLists.txt	2010-04-06 04:24:34.000000000 +0300
++++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt	2010-07-27 21:41:18.000000000 +0300
+@@ -89,8 +89,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.1.0.orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt
+--- OpenCV-2.1.0.orig/CMakeLists.txt	2010-04-06 04:24:37.000000000 +0300
++++ OpenCV-2.1.0/CMakeLists.txt	2010-07-27 21:56:58.000000000 +0300
+@@ -467,8 +467,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.1.0.orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/interfaces/ffopencv/CMakeLists.txt	2010-04-06 04:24:40.000000000 +0300
++++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt	2010-07-27 21:42:00.000000000 +0300
+@@ -40,6 +40,6 @@
+ 
+ install(TARGETS ${the_target}
+ 	RUNTIME DESTINATION bin COMPONENT main
+-	ARCHIVE DESTINATION lib COMPONENT main
+-	LIBRARY DESTINATION lib COMPONENT main
++	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
++	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
+     )
+diff -ur OpenCV-2.1.0.orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cv/CMakeLists.txt	2010-04-06 04:24:42.000000000 +0300
++++ OpenCV-2.1.0/src/cv/CMakeLists.txt	2010-07-27 21:44:32.000000000 +0300
+@@ -71,8 +71,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.1.0.orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cvaux/CMakeLists.txt	2010-04-06 04:24:43.000000000 +0300
++++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt	2010-07-27 21:43:22.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.1.0.orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/cxcore/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt	2010-07-27 21:44:51.000000000 +0300
+@@ -71,8 +71,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.1.0.orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/highgui/CMakeLists.txt	2010-04-06 04:24:44.000000000 +0300
++++ OpenCV-2.1.0/src/highgui/CMakeLists.txt	2010-07-27 21:43:00.000000000 +0300
+@@ -282,8 +282,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.1.0.orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt
+--- OpenCV-2.1.0.orig/src/ml/CMakeLists.txt	2010-04-06 04:24:45.000000000 +0300
++++ OpenCV-2.1.0/src/ml/CMakeLists.txt	2010-07-27 21:43:42.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 --git a/media-libs/opencv/files/opencv-2.2.0-findblas.patch b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
new file mode 100644
index 0000000..0c205f5
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.2.0-findblas.patch
@@ -0,0 +1,36 @@
+diff -ruN OpenCV-2.2.0.orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0.orig/CMakeLists.txt	2011-07-13 21:49:54.474595691 +0200
++++ OpenCV-2.2.0/CMakeLists.txt	2011-07-13 21:51:01.917595716 +0200
+@@ -196,10 +196,30 @@
+ # ----------------------------------------------------------------------------
+ #       CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
+ # ----------------------------------------------------------------------------
++find_package(PkgConfig REQUIRED)
++
++if(BLAS_LIBRARIES)
++  include(CheckFortranFunctionExists)
++  set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
++  CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
++  unset( CMAKE_REQUIRED_LIBRARIES )
++  if(BLAS_FOUND)
++    message(STATUS "BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
++  else(BLAS_FOUND)
++    message(FATAL_ERROR "BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
++  endif(BLAS_FOUND)
++else(BLAS_LIBRARIES)
++   # User did not provide a BLAS Library
++   pkg_check_modules(BLAS blas)
++endif (BLAS_LIBRARIES)
++
++if(NOT BLAS_FOUND)
++    message(FATAL_ERROR "BLAS libraries not found.")
++endif(NOT BLAS_FOUND)
++
+ find_package(LAPACK REQUIRED)
+-find_package(BLAS REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(PkgConfig REQUIRED)
++
+ pkg_check_modules(FLANN REQUIRED flann)
+ 
+ # Build/install (or not) some apps:

diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
new file mode 100644
index 0000000..bccb369
--- /dev/null
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -0,0 +1,117 @@
+# 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.1.0.ebuild,v 1.11 2011/06/26 14:56:25 ranger Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils eutils flag-o-matic 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="v4l? ( GPL-2 ) xine? ( GPL-2 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+IUSE="debug +deprecated examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k octave png python sse sse2 sse3 ssse3 test tiff v4l xine"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/fortran
+	ipp? ( sci-libs/ipp )
+	ieee1394? (
+		sys-libs/libraw1394
+		media-libs/libdc1394:2 )
+	ffmpeg? ( virtual/ffmpeg )
+	gstreamer? ( media-libs/gstreamer )
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg2k? ( media-libs/jasper )
+	jpeg? ( virtual/jpeg )
+	png? ( >=media-libs/libpng-1.4 )
+	tiff? ( media-libs/tiff )
+	xine? ( media-libs/xine-lib )
+	octave? ( sci-mathematics/octave )"
+DEPEND="${RDEPEND}
+	octave? ( dev-lang/swig )
+	python? ( deprecated? ( dev-lang/swig ) )
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="test" #296681
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:share/opencv/doc:share/doc/${PF}:" \
+		CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-multilib.patch \
+		"${FILESDIR}"/${P}-mmap.patch \
+		"${FILESDIR}"/${PN}-2.0.0-libpng14.patch
+}
+
+src_configure() {
+	append-cppflags -D__STDC_CONSTANT_MACROS #324259
+
+	mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		$(cmake-utils_use_build examples)
+		"-DBUILD_LATEX_DOCS=OFF"
+		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+		$(cmake-utils_use_build octave OCTAVE_SUPPORT)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use sse USE_SSE)
+		$(cmake-utils_use sse2 USE_SSE2)
+		$(cmake-utils_use sse3 USE_SSE3)
+		$(cmake-utils_use ssse3 USE_SSSE3)
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use_with ipp)
+		"-DUSE_O3=OFF"
+		$(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 octave; then
+		mycmakeargs+=(
+			$(cmake-utils_use examples INSTALL_OCTAVE_EXAMPLES)
+			)
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			$(cmake-utils_use_build deprecated SWIG_PYTHON_SUPPORT)
+			$(cmake-utils_use examples INSTALL_PYTHON_EXAMPLES)
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize opencv
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup opencv
+}

diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
index a0cab96..47ee381 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.ebuild
@@ -1,16 +1,16 @@
 # 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.2.0-r10.ebuild,v 1.3 2011/05/15 16:42:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.6 2011/07/13 20:03:06 dilfridge Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base cmake-utils python
+inherit base cmake-utils fortran-2 python
 
 MY_P=OpenCV-${PV}
 
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+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"
 
@@ -25,11 +25,11 @@ RESTRICT=test
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
-	sys-devel/gcc[fortran]
 	sys-libs/zlib
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
 	virtual/lapack
+	virtual/fortran
 	cuda? (
 		>=dev-util/nvidia-cuda-toolkit-3.2
 		>=dev-util/nvidia-cuda-npp-3.2
@@ -78,6 +78,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-use_system_libs.patch"
 	"${FILESDIR}/${P}-v4l_2.6.38.patch"
 	"${FILESDIR}/${P}-findnpp.patch"
+	"${FILESDIR}/${P}-findblas.patch"
 )
 
 CMAKE_BUILD_TYPE="Release"
@@ -85,6 +86,7 @@ CMAKE_BUILD_TYPE="Release"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 99f7d1d..b65ff3b 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -1,16 +1,16 @@
 # 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.2.0.ebuild,v 1.6 2011/05/09 23:11:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0.ebuild,v 1.8 2011/06/21 16:12:06 jlec Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit base cmake-utils python
+inherit base cmake-utils fortran-2 python
 
 MY_P=OpenCV-${PV}
 
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems."
+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"
 
@@ -25,11 +25,11 @@ RESTRICT=test
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libf2c
-	sys-devel/gcc[fortran]
 	sys-libs/zlib
 	>=sci-libs/clapack-3.2.1-r4
 	sci-libs/flann
 	virtual/lapack
+	virtual/fortran
 	eigen? ( dev-cpp/eigen:2 )
 	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? (
@@ -79,6 +79,7 @@ CMAKE_BUILD_TYPE="Release"
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup