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

["Andreas K. Huettel" <dilfridge@gentoo.org>]

commit:     ab16c7c4e3b01c8d16eb16095a3c874032ad35be
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat May 14 19:03:52 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 14 19:03:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=ab16c7c4

[media-libs/opencv] Cleanup

(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 media-libs/opencv/ChangeLog                        |    6 +
 media-libs/opencv/Manifest                         |   35 ++---
 .../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 -------------
 media-libs/opencv/opencv-2.1.0.ebuild              |  113 -------------
 media-libs/opencv/opencv-2.2.0-r10.ebuild          |  167 --------------------
 media-libs/opencv/opencv-2.2.0.ebuild              |  165 -------------------
 8 files changed, 20 insertions(+), 603 deletions(-)

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 7ba8703..48f596f 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -2,6 +2,12 @@
 # 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 $
 
+  14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -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:
+  Cleanup
+
 *opencv-2.2.0-r11 (14 May 2011)
 
   14 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index c88961e..a49724d 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +1,6 @@
 -----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
@@ -15,28 +12,24 @@ 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.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
-EBUILD opencv-2.2.0-r10.ebuild 4234 RMD160 5863100749263ee45096a30b300a4a753a5e272c SHA1 05ebc58aa71df31760d56e31ec3d2b07119e267e SHA256 a0e505f8fbf5b5f2e3d2fa3ff8236e75c2f4ae4311bb54d94ae48454477a096b
 EBUILD opencv-2.2.0-r11.ebuild 4395 RMD160 7361fd58b4e154b542fe496fed43bd2e14c4e75e SHA1 7da9bbf9507e995a63e47b5b9c54a661f2e19c85 SHA256 bea812d01c231f072ab830d798a219ad9636139bf4ddbf826e54ca71c7764db7
-EBUILD opencv-2.2.0.ebuild 4129 RMD160 ba0cd2c9e4b22f8e103b6bbd2d4543b57ea53ee3 SHA1 79b97acaff50b27926eb3bef1173779a0ca1f000 SHA256 063511f17ea504f1aa41ec44192dc453dbb4282bb3506b7ea49f0d78ca7ec701
-MISC ChangeLog 6376 RMD160 bf40abf62410a0639dccdba915d74ee099071e1a SHA1 678a18b6ab8b905aaec5b1aeca3fae3d0d02b206 SHA256 de9017fa6370a56cbf34bfb0fc3f70ad04ac2d924acea7ed8e663be067229c53
+MISC ChangeLog 6624 RMD160 fa16a02153451bde0ba1b62172bee8b99d5d229f SHA1 975220ba665a5be7bc522367b887e5fdddae73ce SHA256 c171ef14bd84813dfc4c142910943a3a4ffc608c907f47c3fd3b283c5f5354bd
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNztHhAAoJENwGBM22xffeRmgQAJGA/TxHnRwwMgtx44JMfMxM
-zgfw37cRddVw69hgg0CWcatXqezAKVK6Bb+OV6ss8IO9UcbmcDdOiIUfSvjEqfSn
-GEY7wsQK3nVj2SRGbtl5CHvcmFk/SgFyewEe6Jh5FC/60zyjWwh10FWT/tyiHelz
-t+5tc9HYMCZwOlbVnZadwSKqiW6qMLGYNQMmj2srm6bEEIXAi0sZo86gNjBQ+SYP
-ddRIDyhhFu0enaFl/Ohe99PFrTm8LYY7UolOfNpc7tOCRzIMMyH4C5jI3uqcjpxp
-EAvyzV5HLRQFg/ril5Z1WcQIVCzqy+RsAt9xWE06SPnPcEvojvV7392q+RrddlA2
-HHmpSOz1nlct/PTaAnvzMpB99XFjyT42Mi19Ttwr6Yo/g1RoxGqp1TnPJTerBfFR
-Z1WyVwTXxwLogjSBpfT06DT3UkToLZu5i2xxbJI0jFzXHC0GSycNOl45HqTW+KTT
-JSS6w3+DcNMU99li2vaNFHqonRY2XvonUfvQOYfirwiNLO3E8/Q8nVIXRJrMOQuD
-TRGHNdupmNFD7RWsAxyvWA6AQH+BPgw5L/dZgANv7bYuIW5tRBVquq+hKJZOxa5T
-dkBMW2r5EMlrDNisHNWUDwN5xBYDQHiWgcyLuEaZ4QaisCXvMxVCVre0kRBToaBE
-QD7rOYAO61WN9Q5Fz3td
-=8mdF
+iQIcBAEBCgAGBQJNztIYAAoJENwGBM22xffe2zcQAKZNfYBsHSC331qR0LSzmd1L
+vpmI5bBwbTTe/cRUvM/wZhQCXHP9sWm33g3EsoAmwUBeu6zGXQagjaFPY5pix2Xx
+qJSbL4zqseNBWQdrvfhFOtGQgIBzrZwJoibF/LBWns88JgOR0Fgs9FCRK071BfPZ
+GrB38qgRUcaBIdV9qsnSL4igv2hYLlJkQnTo9Blth+UET3S44jhocjOEuA3MxvxN
+T3Lhy/YcVblbOu9iu4+I/rewzh7Te6m6XDFRfL/eogd7LlSwylsk66nfWJ5iVLVp
+H84kBMoU8CIVnTo23u8UH8St2HA5tkbaIglupy3OqX/HRqs48rlscZxb5Ved+4tj
+k3hDk8jahkG4FDRP1usXldpMx6AwQvvwVFm+eRleFp55a05QM5W7qpzWy9W7HYNu
+xUX0tDUtaEElwPO6haKdMz8EVTwBagPb6g8Z+Ze8V8FXY3HuSRzSThPUzJQf4RQU
+3Sh6eRobCYQ4yXh0tlGgdqFeQrAU0nowIm8gqnsdFZmYX3+At4nGxDPqGasHAcw1
+d+vW3LDFxUXLaOTopYij+pWaWxe0k9j61WCrwhzPvsV+LqB/iWeWLaE9q63vMyXv
+cFZrTJy1oQ3YMEkYUXyhFPKMC0kZZxCC/9t/1Z7Qq/kDEpqQKphdK1uXnU0b+ScN
+qgU9rkbFOigPU/Ra6PQn
+=fwXD
 -----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
deleted file mode 100644
index 56f7a4e..0000000
--- a/media-libs/opencv/files/opencv-2.0.0-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index b7bbc9b..0000000
--- a/media-libs/opencv/files/opencv-2.1.0-mmap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 752ca6f..0000000
--- a/media-libs/opencv/files/opencv-2.1.0-multilib.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
deleted file mode 100644
index e27ae0b..0000000
--- a/media-libs/opencv/opencv-2.1.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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.7 2011/04/14 12:39:11 scarabeus 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 ~hppa ~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
-	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() {
-	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
deleted file mode 100644
index 474bb64..0000000
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.2 2011/05/01 17:53:38 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils 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 ~x86"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
-
-# all tests fail, needs further investigation, bug 296681 - dilfridge
-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
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	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
-		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? ( app-doc/doxygen[-nodot] )
-	dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-convert_sets_to_options.patch"
-	"${FILESDIR}/${P}-fortran.patch"
-	"${FILESDIR}/${P}-ffmpeg01.patch"
-	"${FILESDIR}/${P}-ffmpeg02.patch"
-	"${FILESDIR}/${P}-gcc46.patch"
-	"${FILESDIR}/${P}-libpng1.5.patch"
-	"${FILESDIR}/${P}-numpy.patch"
-	"${FILESDIR}/${P}-ptrcvcapture.patch"
-	"${FILESDIR}/${P}-use_system_libs.patch"
-	"${FILESDIR}/${P}-v4l_2.6.38.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-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 DOXYGEN_DOCS)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
-		$(cmake-utils_use_build test TESTS)
-		$(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_use ipp)
-		$(cmake-utils_use_with ieee1394 1394)
-		$(cmake-utils_use_with cuda)
-		$(cmake-utils_use_with eigen)
-		$(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 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 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: http://bugs.gentoo.org/show_bug.cgi?id=175881
-	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"
-	)
-
-	# things we want to be hardly enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
-	cmake-utils_src_test
-}

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
deleted file mode 100644
index 99f7d1d..0000000
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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 $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit base cmake-utils 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 x86"
-IUSE="doc eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
-
-# all tests fail, needs further investigation, bug 296681 - dilfridge
-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
-	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 )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
-	python? ( dev-python/numpy )
-	qt4? (
-		x11-libs/qt-gui: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? ( app-doc/doxygen[-nodot] )
-	dev-util/pkgconfig
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-convert_sets_to_options.patch"
-	"${FILESDIR}/${P}-fortran.patch"
-	"${FILESDIR}/${P}-ffmpeg01.patch"
-	"${FILESDIR}/${P}-ffmpeg02.patch"
-	"${FILESDIR}/${P}-gcc46.patch"
-	"${FILESDIR}/${P}-libpng1.5.patch"
-	"${FILESDIR}/${P}-numpy.patch"
-	"${FILESDIR}/${P}-ptrcvcapture.patch"
-	"${FILESDIR}/${P}-use_system_libs.patch"
-	"${FILESDIR}/${P}-v4l_2.6.38.patch"
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S=${WORKDIR}/${MY_P}
-
-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 DOXYGEN_DOCS)
-		$(cmake-utils_use_build examples)
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-		$(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_enable sse SSE)
-		$(cmake-utils_use_enable sse2 SSE2)
-		$(cmake-utils_use_enable sse3 SSE3)
-		$(cmake-utils_use_enable ssse3 SSSE3)
-		-DUSE_ipp=OFF
-		$(cmake-utils_use_with ieee1394 1394)
-		-DWITH_cuda=OFF
-		$(cmake-utils_use_with eigen)
-		$(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 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 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: http://bugs.gentoo.org/show_bug.cgi?id=175881
-	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"
-	)
-
-	# things we want to be hardly enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
-	cmake-utils_src_test
-}