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

[Mike Auty]

commit:     13070126cb75d7c994e3f8a7e97dea76e435f755
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  2 20:59:32 2015 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Mon Feb  2 20:59:32 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=13070126

Remove opencv, since it's much older than the in-tree version.

---
 media-libs/opencv/ChangeLog                        | 111 -------------------
 media-libs/opencv/Manifest                         |   7 --
 .../opencv/files/opencv-2.0.0-libpng14.patch       |  13 ---
 .../opencv/files/opencv-2.0.0-multilib.patch       | 120 ---------------------
 media-libs/opencv/files/opencv-2.1.0-mmap.patch    |  14 ---
 .../opencv/files/opencv-2.1.0-multilib.patch       | 110 -------------------
 media-libs/opencv/metadata.xml                     |  21 ----
 media-libs/opencv/opencv-2.1.9999.ebuild           | 102 ------------------
 8 files changed, 498 deletions(-)

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
deleted file mode 100644
index 0889a48..0000000
--- a/media-libs/opencv/ChangeLog
+++ /dev/null
@@ -1,111 +0,0 @@
-# ChangeLog for media-libs/opencv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.23 2010/07/27 19:24:09 ssuominen Exp $
-
-  27 Jul 2010; Samuli Suominen <ssuominen@g.o> opencv-2.1.0.ebuild,
-  +files/opencv-2.1.0-mmap.patch:
-  Fix bug in v4l code wrt #313649, Comment #14 by Uwe Sauter.
-
-*opencv-2.1.0 (27 Jul 2010)
-
-  27 Jul 2010; Samuli Suominen <ssuominen@g.o> +opencv-2.1.0.ebuild,
-  +files/opencv-2.1.0-multilib.patch, metadata.xml:
-  Version bump.
-
-  16 Jun 2010; Samuli Suominen <ssuominen@g.o>
-  opencv-2.0.0-r1.ebuild:
-  Fix building with FFmpeg >= 0.6 wrt #324259 by Alexis Ballier.
-
-  12 May 2010; Samuli Suominen <ssuominen@g.o> opencv-2.0.0.ebuild:
-  Backport -libpng14.patch to -r0 of 2.0.0 because -r1 can't be stabilized.
-
-  09 Mar 2010; Samuli Suominen <ssuominen@g.o>
-  opencv-2.0.0-r1.ebuild, +files/opencv-2.0.0-libpng14.patch:
-  Fix building with libpng14.
-
-  06 Feb 2010; Ulrich Mueller <ulm@g.o> opencv-2.0.0.ebuild,
-  opencv-2.0.0-r1.ebuild:
-  Fix LICENSE, bug 301123.
-
-  06 Jan 2010; Joseph Jezak <josejx@g.o> opencv-2.0.0-r1.ebuild:
-  Marked ~ppc64.
-
-  07 Dec 2009; Markus Meier <maekke@g.o> opencv-2.0.0.ebuild:
-  x86 stable, bug #295475
-
-*opencv-2.0.0-r1 (04 Dec 2009)
-
-  04 Dec 2009; Samuli Suominen <ssuominen@g.o> opencv-2.0.0.ebuild,
-  +opencv-2.0.0-r1.ebuild:
-  amd64 stable wrt #295475. Revision bump to skip sci-libs/ipp depend for
-  -r0.
-
-*opencv-2.0.0 (16 Oct 2009)
-
-  16 Oct 2009; Samuli Suominen <ssuominen@g.o> +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@g.o>
-  opencv-1.0.0-r1.ebuild, +files/opencv-1.0.0-gcc44.patch:
-  Fix building with GCC 4.4 wrt #274261.
-
-  02 Mar 2009; Thomas Anderson <gentoofan23@g.o>
-  opencv-1.0.0-r1.ebuild:
-  Bump needed swig version to fix bug #260172
-
-  15 Feb 2009; Patrick Lauer <patrick@g.o>
-  +files/opencv-1.0.0-fix-swig.patch, opencv-1.0.0-r1.ebuild:
-  Fixing small error in the building of py bindings. Patch from John
-  Keeping, closes #258652
-
-  27 Dec 2008; Thomas Anderson <gentoofan23@g.o> metadata.xml,
-  opencv-1.0.0-r1.ebuild:
-  Fix homepage, bug #252367 by Thomas Pani. Tweak metadata.xml a bit
-
-  02 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
-  metadata.xml:
-  Removing jmglov as a maintainer since he was retired.
-
-  12 Oct 2008; Thomas Anderson <gentoofan23@g.o>
-  +files/opencv-1.0.0-swiginvalidlinkingoptions.patch,
-  opencv-1.0.0-r1.ebuild:
-  Fix problems when SWIG_PYTHON_LIBS was empty, resulting in '-L -o'. Reported
-  by Blorby in bug #239563, patch stolen from Exherbo
-
-  25 Oct 2008; Pieter Van den Abeele <pvdabeel@g.o> opencv-1.0.0-r1.ebuild:
-  Keyworded ~ppc. Closes bug #236085
-
-  14 Sep 2008; Thomas Anderson <gentoofan23@g.o> metadata.xml:
-  Picking up maintainership as current maintainer is inactive.
-
-  29 Jun 2008; Peter Alfredsen <loki_val@g.o>
-  +files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch, opencv-1.0.0-r1.ebuild:
-  Add patch for ffmpeg-0.4.9_p20080326 compatibility. Depends for ffmpeg
-  raised to >=ffmpeg-0.4.9_p20080326. Bug #229621 and bug #229405.
-
-*opencv-1.0.0-r1 (23 Jun 2008)
-
-  23 Jun 2008; Thomas Anderson <gentoofan23@g.o>
-  +files/opencv-1.0.0-addoptionalsamples.patch,
-  +files/opencv-1.0.0-automagicdependencies.patch,
-  +files/opencv-1.0.0-cvcapffmpegundefinedsymbols.patch,
-  +files/opencv-1.0.0-enableuseflags.patch,
-  +files/opencv-1.0.0-fixpythonmultilib.patch,
-  +files/opencv-1.0.0-havepngexrdefs.patch, -opencv-1.0.0.ebuild,
-  +opencv-1.0.0-r1.ebuild:
-  Import changes from science overlay, fixes tons of automagic bugs as well as
-  multilib bugs. Keyworded ~amd64
-
-  20 Jun 2008; Samuli Suominen <drac@g.o> opencv-1.0.0.ebuild:
-  QAbaddep; pkgconfig is only a build-time depend.
-
-  18 Jun 2008; Josh Glover <jmglov@g.o> opencv-1.0.0.ebuild:
-  added missing src_install() so that package installs files
-
-*opencv-1.0.0 (18 Jun 2008)
-
-  18 Jun 2008; Josh Glover <jmglov@g.o> +metadata.xml,
-  +opencv-1.0.0.ebuild:
-  Added to Portage tree
-

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
deleted file mode 100644
index 0983c7b..0000000
--- a/media-libs/opencv/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
-AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777
-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
-EBUILD opencv-2.1.9999.ebuild 2773 RMD160 3a5264f01efda980960046053ac58ece460931ea SHA1 1245fb1e166d0ec575098296e1578ea44824b96d SHA256 e57c446c54ffc1eae4997ef165df27c9fb2af14e41caf487adb7c19ad8f6d9ad
-MISC ChangeLog 4277 RMD160 0895b5034137e75b6e7115394a84e45b9b5d2904 SHA1 978559a87192cce5b8d669c21eab2f30117ba59a SHA256 cc17b1ce8eaf4fb2fc4684f3161a24fc6397b164af5289b11789f1f775623b75
-MISC metadata.xml 1077 RMD160 698e45d20b4651c827a6546a5fa11db2b3919cd9 SHA1 2be6ca7ffbd3b30780534a5bf0f6af8afad2fb79 SHA256 a2958aed83ba6742d645e7cdd48900fec3be1ef39b1970805f00ae3241b31c76

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.0.0-multilib.patch b/media-libs/opencv/files/opencv-2.0.0-multilib.patch
deleted file mode 100644
index b1075aa..0000000
--- a/media-libs/opencv/files/opencv-2.0.0-multilib.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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/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/metadata.xml b/media-libs/opencv/metadata.xml
deleted file mode 100644
index 0df9db5..0000000
--- a/media-libs/opencv/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>tanderson@g.o</email>
-  <name>Thomas Anderson</name>
-</maintainer>
-<longdescription>
-OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
-Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
-Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
-</longdescription>
-<use>
-  <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="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-  <flag name="deprecated">Enable deprecated (old) python support</flag>
-</use>
-</pkgmetadata>

diff --git a/media-libs/opencv/opencv-2.1.9999.ebuild b/media-libs/opencv/opencv-2.1.9999.ebuild
deleted file mode 100644
index 1ff7191..0000000
--- a/media-libs/opencv/opencv-2.1.9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2010 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.4 2010/07/28 14:49:57 ssuominen Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit cmake-utils eutils flag-o-matic python subversion
-
-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"
-ESVN_REPO_URI="https://code.ros.org/svn/opencv/trunk/opencv"
-
-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
-	ipp? ( sci-libs/ipp )
-	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-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
-}
-
-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
-}