Clean up

Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

10 files changed, 24 insertions, 801 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 72e1fa790cab..3cb66b283b25 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.94 2013/06/11 21:10:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.95 2013/06/20 19:34:35 dilfridge Exp $
+
+  20 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/opencv-2.3.0-numpy.patch, -files/opencv-2.3.1a-True-False.patch,
+  -files/opencv-2.3.1a-convert_sets_to_options.patch,
+  -files/opencv-2.3.1a-gcc47.patch, -files/opencv-2.3.1a-libsuffix.patch,
+  -files/opencv-2.3.1a-nocaps.patch, -files/opencv-2.4.4-javamagic.patch,
+  -opencv-2.4.4a.ebuild:
+  Clean up
 
   11 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.5.ebuild:
   Add workaround for bug 413429
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 0bf06ceaaf2a..324aeec80363 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,41 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX opencv-2.3.0-numpy.patch 551 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378 SHA512 23a0882876334163707f0b008e19b28d5815311d8c79be1be5eaf247a7e1f1fc62b93d6cc74f2765e3bd99a9d2ec7bb14512c5480e2e94871269a5e9093d950b WHIRLPOOL 49a4d86bcf7ef7fef2ea14bc71e6839e89c4b0fbd6e493d036bd74723084ed1329f10f39d6116bbfec4076e06907d85d9ff2848c11722a976f57495f670c192c
-AUX opencv-2.3.1a-True-False.patch 5120 SHA256 8076260c01e8ec22d30ced74be64b158e96408b81990a7d14f031170e3165f7f SHA512 958403cfcef87b76104517d0d213ac98d6243be2d793bba333a19698ed9749f95340afcb484e301716456eae184b75bfb8754b33c28109749cd541a1a7df046d WHIRLPOOL 1046145b4bb2ea48181dd80747244c0e29233976a34b7c24b82cecbd4943c49566d24a4ec0ca8d76bae2d1aa1ab0839b631d0ecb291da5bd5e2a2f2b597c5f76
-AUX opencv-2.3.1a-convert_sets_to_options.patch 10029 SHA256 7ac857ed496245cb39ccbb4ec7bfdcc4128654def5732bb0de3631404a7ffc2c SHA512 2b9e6922fa8a09303033e6a7b8b36107d559e8d8d5195a7693a59538f664ba951208cc0d28f4e42d9990b2d4e8cd85683e4c9266fef99a60ae05635e1d488018 WHIRLPOOL ffd96a357e673a9c4065b66d26e4f4e8a6381d4229406fccf474a4d1b02668d385d0fdb226476466a21583090fed849d89f062d54191c38660b6d0b6ee583fc8
-AUX opencv-2.3.1a-gcc47.patch 811 SHA256 62defcf34b6e4c00ddfe67d64234b68ba5ac1315037d427aa81133399e2b430e SHA512 2b31af0a14f2d27d28454c350038f417d2c2222978d2db5284ca1ef925e56b9481259360ea75a7ceb5f22b2addfd9e90bb33aece9483a0b4be45196250111fef WHIRLPOOL a8da3bdf34b357d358bc6df8e420c6c6b54aea2efb4dee66037a9601f44d52b5ac949e7291e8d3a74488ad7e9de0cc537a4a58de1ea1a52218230cec0cfa36d1
 AUX opencv-2.3.1a-libav-0.7.patch 415 SHA256 3186998b7b9eaae061d538633276c7de47b2388b639106e190d80dcf09fb9099 SHA512 b17466470a47876e1a8434367f47ce13ec989bdc35ec707d87188187e08b8ccca6af4c5563f20b3170758582b500323030cff22961a7fbbc6b4843d8bb808f1e WHIRLPOOL 5caf84c49efef118e1c90f6bd88237c6d91e9b37163248e5a6f6c135ae60f5f4f4328d83f061df2c4d5f81fdf68faa5b55828feaf67707956701c633614cc5fc
-AUX opencv-2.3.1a-libsuffix.patch 1949 SHA256 442c5e7fab7cf28f806c8fc2057d17705b71d95da8ba0792828dab91c6742f44 SHA512 353609bfa761833945afee5b78f5efe0feaf435409b6aca1780da28bfe77b966d0511b1c173cf58ccaea2b8fcd49bbcf6f270dbd46f32eea7282bdb2be8f32bf WHIRLPOOL 3479194bcb35b633ae2a0d6a10d6f7278b5f7cf1bcc9c5c333cfb61c900434d895b1f2d86f764c3717f8ddcf50ddcc4239a90c63787e6ee789edf3a2d4449081
-AUX opencv-2.3.1a-nocaps.patch 5220 SHA256 eedd2f7881e592a34217e8217a5600c307dbb9558197ca576b431e4c30ce8207 SHA512 4df5cc178246befdf2913877abfc0e842dc76ab59baa82423d48979b3c18077020755708995a4c20d1d7a3e6bbfa54c9e6907ea472fe07ef791fa16f717c0ce1 WHIRLPOOL f00c5aa6e2b15740eb022c4d52c3217f8fdcaad14f177e350f64b1c3dab039ae24d43537b1374967145c8bc9953750fccdf8236aaeb90821692799cd2c304f29
 AUX opencv-2.4.2-cflags.patch 742 SHA256 7ea8c07becb830fb03c14bfbf6c25fdfeaf3fcb75949b810520f4fd6c1178c1c SHA512 b92c07d8c9c40ad7721e0cca2d79b001f825478a336ad40cb43d02218fcd9e8b94b871575028ca8eaf6616cfce8138c796f32d4cf55d83d5cbe819ec50cf7c82 WHIRLPOOL f83ee4b677490cf6981b5a326ae6a7ad4cfae1c27fc6c516d054337939957d801ff1319798d2b0b9e86429b8d688f514e74b74bfff56c64df06fc3c7035f320e
 AUX opencv-2.4.3-gcc47.patch 835 SHA256 bb64b8af632b67293d1c8024b3786162fccc9f4ee4159f6592af0e76e86b7b00 SHA512 cc5e3e4c0def0745867403e990abf4b88d7d3edc72867a283403a991fd96f59c4cca6524ca184a52a40c913cd5d9cdfb52e98be71d5060fc4c7aa6b613a2a220 WHIRLPOOL 52aa228d8ebf2ba51eb67cc31ba4eee27f43d5fc86d3b5028e32e2a8caf1350ebda70bab2a060f9a387312795788b575253d446380645e52e7cf10f57cad9a88
-AUX opencv-2.4.4-javamagic.patch 1187 SHA256 03fb9c62464a09809d1fd8a14d1dab31f9d6ae0fc3d6916590217966fe1b8045 SHA512 84c6dac9c0dc2a9573af400543f746a28a1db0bd02318d5a0fb6262d7151ebc8ef0d327bd51ba0e82a95c04fe81040f6aed6f2dbe3de0820723a7726c2fc00e1 WHIRLPOOL c9d7ba39dc68bf1f9e4ae4aa198b431d39a98d22cd6ccc838facd7dcd8ccb6cd6ad3fafe8a1879d6d8ac740b2b0a3eb10faf997d8b09fa76f238e9854a492ed3
 AUX opencv-2.4.5-javamagic.patch 1140 SHA256 1a3fd6918982909dc1de4258cc386139f7005617032cb457d5ea521f0b4d2ad5 SHA512 f283529bc6482203b2ffdf57aafcdf80351eaf8d09c07c6f14991e5d6bc25679dab31f3dd0475b1eee32f9ba8636e9ba96755b90c96de7059c8f69c0d43746aa WHIRLPOOL a483809bfe0ca11a299757bd1ec42ada5fc1d415eb366f9e2d05a6e8a30dec6b8d8baf662da0041632e23b3ed0d4f90e612fb15ede0e126c09e9a98da7a9621c
 DIST OpenCV-2.4.3.tar.bz2 67240491 SHA256 f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b SHA512 5305e726089f3f43b2bac06b09e2b5f021c63421ba0b36eeb10e43a067a6954569fccb5a66ff8971e83ffb2c3829df222b74e6a33117f85286b3389e5add232e WHIRLPOOL a384e7d09ac31638bb4bc93c2c7c6b2bc88d0344a494d44d53110528a1abb84250b7979c46d3be55891b61b952ed780f10cee41478bdb906357d80bf52f52b57
-DIST OpenCV-2.4.4a.tar.bz2 74636004 SHA256 e663cf6e4762c8be2f80f9bca8fb32c01d65e103df44c2df4a728ddf65216030 SHA512 7ea28d57a8a7127c7daf25df087420c163ab4d0c765f02919aff28dffc27f7d2c378fb738da7182ffd4102080d9fc57eff214dc54514d7b6525675acd2068fd2 WHIRLPOOL f18ec40c16b1a7a32d4b3e6788d0ea94a9ea80626f91245d2d7a076b2de280c41f775ce1876ae2948958b3c344aeb6821d81c8e576aa7fa40dfbb497f22e0786
 DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0
 EBUILD opencv-2.4.3.ebuild 4780 SHA256 384324386e196d6238b9000db1a100116196c2506883acda04ac353a5678881e SHA512 e4b7f9b4489aecde56ab2650933974457d145dfd76faae464458ae41105c30b5f2dc600b7ff2890d762d300739e21f5ff290d2eb6ef4f91bba3f47cbed1db2e9 WHIRLPOOL 46007ca0dac016fcea8fd509d1c07a0e500c7616f97084fca3fb003a50efc781a3127c1c286dfe9ede13ee6dc9a84e2072cf5721e952767a0fa5df33ecee582f
-EBUILD opencv-2.4.4a.ebuild 5169 SHA256 8a8fbd17d1adb4cebae4f40cf839327c436a22cc54044e5053f327e891b6fd56 SHA512 dbb1deba4d434fdc66b7cc8738440b4d291224102b5fd6dc0f7714a8f5fa8e4d28877dfb8ba1bdec9246c9483d0b8157d751756ba44e5015e183e9257050a6e9 WHIRLPOOL d403127a4702efc5f1d75fa19a699a5edc3588862a687f218c7bdd0cd3c171d119e0581c62aac0c270cb1d8c4f8126ed087e53159b7680e2fd6e321e20fe8d75
 EBUILD opencv-2.4.5.ebuild 5166 SHA256 dd4943a9d9933d4a95bf214a11f3c82970d6ad9395e331306dace1aeca2eedd4 SHA512 d2b13c514494c4ae38ae51e313f9fcf3cf5039c341a0487b74ecae557a4a0b2b0cfc13c9451f0a86f86817bdec1e32b27f881801ecb0babb691ad6c0a692a395 WHIRLPOOL 1802c120654b97c64e345b02cd5f896265dc823f8757767d5f09758bfcf9b8876c9af7b1a3aec06b1b542fe42edc3a7b8c274f73b13674f46e4479b96f1de57c
-MISC ChangeLog 16427 SHA256 5d8ac7132c8cec4dd70e310f5c1fa548d97f5e8594eefb89058d5261b91b1c14 SHA512 c8ff00bf381a97d74ff8eda7ef3b7256e841ebce157b50bd16e691f6f2adeba38258f4330600911984d1f18199a087ccd46bbb7b21bd93ea80acc9c90ce4e178 WHIRLPOOL d3c3ad3b5b9e1a7563eb46b1ab0ef4cec5e74e855b1a55f799075d008a2980d7dff04d8b67155601bf795ff76d17a49ec57ca1575317f72574ea8756947b0d33
+MISC ChangeLog 16797 SHA256 8b81e68d37976f43a233aee9ab6ecca5f51801de81f9b17b42302931fdb45d2a SHA512 585871466c26600d50dd94ede4fe6d04b0f37f728f3b9813a61a906e80419e5cb1d7b00b2fa4c55135b59d8f0e5028772bd13816ebcd5d99a794f2663778969c WHIRLPOOL a9c2ebfe27fbacf57e511e20870fcea40fb4c44b7f1d1bc85550b56115d5a81c445bd0905c54b4be36a84251a02e61f73f1797dacba37b9ef760bf62b05fa567
 MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRt5KyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRw1nHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcvH8QAIfJ7dkYxYIGhgHskZYZDf5c
-ZKRng6AWL77OaTq67d2Bk3Lr3ykeNjx7JBFuReTp/dYh/8ENiyIsM5HmCjlz+qRO
-+wTy0QPrTZCE1I98b7QKSOy92lPlidg+YkG3PjAN39+Mq78eq/80nAIiEOGeCym2
-fHi1DOoCvu5mBK+mHvOEQMrrtZnEzQaCl7LXsvycxX80lBF61nz5C/Tyak3Tf3sj
-lhcmIUI0criHuHUq0S2KPnr3trll9KFdhKjYZ3w8zyqzOCiU0oZd2DJ8RncuPhEZ
-v3ThralQQYdbI/piftV2FMc2gOR8YsOoY7lhIHtqEtysKFND3TGWXxEGyF2b7U+u
-wYvM4MVEtBAKwTxiMwBSbmVawBzys675bepjaZgRm9rvGC9uhi+tcG42sp9gEhNu
-mSKI03dr5u7J1fCPo2LJphrIKMnqA5AZ2e3EYYD/Bw9VFMADgQ8DXr96ZBvNdwGF
-OKB4S/M1EgjGEt/URvmhbF9bO3kUCVZdL4uK0Jec+l2BYSSst5ll8cV4O0LSe/Ja
-Alw7BtsEXpx3r4ZtXzgGUSM/2lncHkfjdHdeNwgCJMdxvk4MXU4FilK2WplzUOQ8
-FKQCp2mDV15CWnukZQu0fTYyHRwmp2k1GiZ7ZViCXzhdE7ovgJPa7U7yEqQTu9hU
-JEzdFL8lUYoMTFwIwFYV
-=3qf3
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcFzgQANEYF8lGDl/fXs9dyOSob/c2
+I6D8gOCpgykHZHXge3ZBszaqHJwzvP7F0PaN7iUlXIXpXmF3t7xHUM48uZmkqx9h
+HcH0xKPyT/oua86JURdpF7PnPIwrut7YH5zPXkHCQ7OFuXp/DV0pRYSbWJW+NcDb
+xD7ZSPsbmkXfPytjxPmzJFbgrYQL/Kx7Ag+CcaMZIPd80Z8j7+AeoCE5vBF+1iN6
+rfshMmlubuM4gjbxutXZyd1TfD5EwTfYaqTLcsLxG4P/PxsnxwcszKfoXOUVdgUp
+32onrj5LDVR33pyeRymdht/RNP9pGX2ozBnM48QstkIcYj1+49FAhWui7TGJ/z3W
+xV0Pvug0j6e8QOT19X6SoiwtWCC8HLhgtrJuhITquJO0W0VJD8YG0fpHCFEhdJJd
+yRNJRAloY7dNCfmGGEuYEWSWbbEmR6ocYtZS2z80GP3jTn8Ai5mS+bX0LQadjdYP
+ktS2Hz0f0kuMfJ3qakQ3HG71NZnKCk2OorIMFsjH7l95RmHBuBneZ9E+RAqDpp+v
+8ccgSjkz8ofyJFU4A+f0wrAVotegjw22TnOEJuRy4XZPj/EOgbuOb6WQTExlX77x
+yNSkGWkPhSuYGmQi4ajS0n5VhF1TV/1hS/JMnj8VTJXWrwt2yv6YqvNcQR7oKXH1
+H5t9+DZftQInL+pCXvuH
+=ZrHG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-2.3.0-numpy.patch b/media-libs/opencv/files/opencv-2.3.0-numpy.patch
deleted file mode 100644
index e0706d21674f..000000000000
--- a/media-libs/opencv/files/opencv-2.3.0-numpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN OpenCV-2.3.0-1-ol1/CMakeLists.txt OpenCV-2.3.0-2-numpy/CMakeLists.txt
---- OpenCV-2.3.0-1-ol1/CMakeLists.txt	2011-08-28 14:53:46.000000000 +0200
-+++ OpenCV-2.3.0-2-numpy/CMakeLists.txt	2011-08-28 15:26:37.000000000 +0200
-@@ -640,7 +640,7 @@
- 
- if(PYTHON_NUMPY_PROCESS EQUAL 0)
-     set(PYTHON_USE_NUMPY 1)
--    add_definitions(-D PYTHON_USE_NUMPY=1)
-+    add_definitions(-DPYTHON_USE_NUMPY=1)
-     include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
-     message(STATUS "    Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}")
- else()
diff --git a/media-libs/opencv/files/opencv-2.3.1a-True-False.patch b/media-libs/opencv/files/opencv-2.3.1a-True-False.patch
deleted file mode 100644
index fddcb67df45f..000000000000
--- a/media-libs/opencv/files/opencv-2.3.1a-True-False.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/all_indices.h OpenCV-2.3.1/modules/flann/include/opencv2/flann/all_indices.h
---- OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/all_indices.h	2011-09-12 13:42:27.000000000 -0500
-+++ OpenCV-2.3.1/modules/flann/include/opencv2/flann/all_indices.h	2011-12-08 15:54:23.000000000 -0600
-@@ -88,7 +88,7 @@
- };
- 
- template<typename VectorSpace, typename Distance>
--struct index_creator<False,VectorSpace,Distance>
-+struct index_creator<XFalse,VectorSpace,Distance>
- {
-     static NNIndex<Distance>* create(const Matrix<typename Distance::ElementType>& dataset, const IndexParams& params, const Distance& distance)
-     {
-@@ -117,7 +117,7 @@
- };
- 
- template<typename Distance>
--struct index_creator<False,False,Distance>
-+struct index_creator<XFalse,XFalse,Distance>
- {
-     static NNIndex<Distance>* create(const Matrix<typename Distance::ElementType>& dataset, const IndexParams& params, const Distance& distance)
-     {
-diff -ur OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/dist.h OpenCV-2.3.1/modules/flann/include/opencv2/flann/dist.h
---- OpenCV-2.3.1.orig/modules/flann/include/opencv2/flann/dist.h	2011-09-12 13:42:27.000000000 -0500
-+++ OpenCV-2.3.1/modules/flann/include/opencv2/flann/dist.h	2011-12-08 15:54:11.000000000 -0600
-@@ -79,11 +79,11 @@
- struct Accumulator<int> { typedef float Type; };
- 
- 
--class True
-+class XTrue
- {
- };
- 
--class False
-+class XFalse
- {
- };
- 
-@@ -97,8 +97,8 @@
- template<class T>
- struct L2_Simple
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -130,8 +130,8 @@
- template<class T>
- struct L2
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -195,8 +195,8 @@
- template<class T>
- struct L1
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -252,8 +252,8 @@
- template<class T>
- struct MinkowskiDistance
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -316,8 +316,8 @@
- template<class T>
- struct MaxDistance
- {
--    typedef False is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -373,8 +373,8 @@
-  */
- struct HammingLUT
- {
--    typedef False is_kdtree_distance;
--    typedef False is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XFalse is_vector_space_distance;
- 
-     typedef unsigned char ElementType;
-     typedef int ResultType;
-@@ -475,8 +475,8 @@
- template<class T>
- struct Hamming
- {
--    typedef False is_kdtree_distance;
--    typedef False is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XFalse is_vector_space_distance;
- 
- 
-     typedef T ElementType;
-@@ -537,8 +537,8 @@
- template<typename T>
- struct Hamming2
- {
--    typedef False is_kdtree_distance;
--    typedef False is_vector_space_distance;
-+    typedef XFalse is_kdtree_distance;
-+    typedef XFalse is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef int ResultType;
-@@ -596,8 +596,8 @@
- template<class T>
- struct HistIntersectionDistance
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -649,8 +649,8 @@
- template<class T>
- struct HellingerDistance
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -697,8 +697,8 @@
- template<class T>
- struct ChiSquareDistance
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
-@@ -751,8 +751,8 @@
- template<class T>
- struct KL_Divergence
- {
--    typedef True is_kdtree_distance;
--    typedef True is_vector_space_distance;
-+    typedef XTrue is_kdtree_distance;
-+    typedef XTrue is_vector_space_distance;
- 
-     typedef T ElementType;
-     typedef typename Accumulator<T>::Type ResultType;
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
deleted file mode 100644
index 522561bafbfc..000000000000
--- a/media-libs/opencv/files/opencv-2.3.1a-convert_sets_to_options.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- OpenCV-2.3.1-0-vanilla/CMakeLists.txt
-+++ OpenCV-2.3.1-2-options/CMakeLists.txt
-@@ -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()
-@@ -1222,12 +1222,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-         endif()
-     endif()
- 
--    if(X86 OR X86_64)
--        if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
--            set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387")
--        endif()
--    endif()
--
-     # Profiling?
-     if(ENABLE_PROFILING)
-         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g")
-@@@ -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-gcc47.patch b/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch
deleted file mode 100644
index 4a7263f4babe..000000000000
--- a/media-libs/opencv/files/opencv-2.3.1a-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN OpenCV-2.3.1.orig/modules/highgui/src/grfmt_tiff.cpp OpenCV-2.3.1/modules/highgui/src/grfmt_tiff.cpp
---- OpenCV-2.3.1.orig/modules/highgui/src/grfmt_tiff.cpp	2011-09-12 20:41:29.000000000 +0200
-+++ OpenCV-2.3.1/modules/highgui/src/grfmt_tiff.cpp	2012-05-06 22:02:17.041467539 +0200
-@@ -47,6 +47,7 @@
- 
- #include "precomp.hpp"
- #include "grfmt_tiff.hpp"
-+#include "unistd.h"
- 
- namespace cv
- {
-diff -ruN OpenCV-2.3.1.orig/modules/highgui/src/window_QT.h OpenCV-2.3.1/modules/highgui/src/window_QT.h
---- OpenCV-2.3.1.orig/modules/highgui/src/window_QT.h	2011-09-12 20:41:29.000000000 +0200
-+++ OpenCV-2.3.1/modules/highgui/src/window_QT.h	2012-05-06 22:02:58.208469764 +0200
-@@ -42,6 +42,7 @@
- 

- 

- #include "precomp.hpp"

-+#include "unistd.h"

- 

- #if defined( HAVE_QT_OPENGL )

- #include <QtOpenGL>

diff --git a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch b/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
deleted file mode 100644
index 6481ee869a28..000000000000
--- a/media-libs/opencv/files/opencv-2.3.1a-libsuffix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 23abeb2ffbb9..000000000000
--- a/media-libs/opencv/files/opencv-2.3.1a-nocaps.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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/files/opencv-2.4.4-javamagic.patch b/media-libs/opencv/files/opencv-2.4.4-javamagic.patch
deleted file mode 100644
index fa0321102ce3..000000000000
--- a/media-libs/opencv/files/opencv-2.4.4-javamagic.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN opencv-2.4.4.orig/CMakeLists.txt opencv-2.4.4/CMakeLists.txt
---- opencv-2.4.4.orig/CMakeLists.txt	2013-03-01 16:44:17.000000000 +0100
-+++ opencv-2.4.4/CMakeLists.txt	2013-03-29 18:01:36.463227214 +0100
-@@ -144,7 +144,7 @@
- OCV_OPTION(WITH_OPENCL         "Include OpenCL Runtime support"              OFF  IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDFFT   "Include AMD OpenCL FFT library support"      OFF  IF (NOT ANDROID AND NOT IOS) )
- OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     OFF  IF (NOT ANDROID AND NOT IOS) )
--
-+OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
- 
- # OpenCV build components
- # ===================================================
-@@ -392,6 +392,8 @@
- include(cmake/OpenCVDetectPython.cmake)
- 
- # --- Java Support ---
-+if(WITH_JAVA)
-+
- include(cmake/OpenCVDetectApacheAnt.cmake)
- if(ANDROID)
-   include(cmake/OpenCVDetectAndroidSDK.cmake)
-@@ -409,6 +411,11 @@
-   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
- endif()
- 
-+else()
-+  SET(ANT_EXECUTABLE "")
-+  SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
-+endif()
-+
- # --- OpenCL ---
- if(WITH_OPENCL)
-   include(cmake/OpenCVDetectOpenCL.cmake)
diff --git a/media-libs/opencv/opencv-2.4.4a.ebuild b/media-libs/opencv/opencv-2.4.4a.ebuild
deleted file mode 100644
index 763d0ccdb8fb..000000000000
--- a/media-libs/opencv/opencv-2.4.4a.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.4a.ebuild,v 1.3 2013/04/06 10:17:50 dilfridge Exp $
-
-EAPI=5
-PYTHON_DEPEND="2:2.6"
-
-inherit base toolchain-funcs cmake-utils python java-pkg-opt-2 java-ant-2
-
-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/opencvlibrary/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-python/numpy
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 )
-	eigen? ( dev-cpp/eigen:2 )
-	ffmpeg? ( virtual/ffmpeg )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-	)
-	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	ipp? ( sci-libs/ipp )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/glu )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qttest:4
-		opengl? ( dev-qt/qtopengl:4 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )
-"
-
-# REQUIRED_USE="opengl? ( qt )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.4-javamagic.patch"
-)
-
-S=${WORKDIR}/opencv-2.4.4
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		$(cmake-utils_use_with ieee1394 1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_CARBON=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 ipp)
-		$(cmake-utils_use_with java)
-		$(cmake-utils_use_with jpeg2k JASPER)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with opencl)
-	#	$(cmake-utils_use_with opencl OPENCLAMDFFT)
-	#	$(cmake-utils_use_with opencl OPENCLAMDBLAS)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with opengl)
-		-DWITH_OPENNI=OFF					# not packaged
-		$(cmake-utils_use_with png)
-		-DWITH_PVAPI=OFF					# not packaged
-		$(cmake-utils_use_with qt4 QT)
-		-DWITH_QUICKTIME=OFF
-		$(cmake-utils_use_with threads TBB)
-		$(cmake-utils_use_with tiff)
-		-DWITH_UNICAP=OFF					# not packaged
-		$(cmake-utils_use_with v4l V4L)
-		-DWITH_VIDEOINPUT=OFF					# windows only
-		-DWITH_XIMEA=OFF					# windows only
-		$(cmake-utils_use_with xine)
-	# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		$(cmake-utils_use_build doc DOCS)
-		$(cmake-utils_use_build examples)
-		-DBUILD_PERF_TESTS=OFF
-		$(cmake-utils_use_build testprograms TESTS)
-	# install examples
-		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
-	# build options
-		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-		-DENABLE_OMIT_FRAME_POINTER=OFF				#
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.6" ]]; then
-			ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( "-DWITH_CUDA=OFF" )
-			mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-			mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-		else
-			mycmakeargs+=( "-DWITH_CUDA=ON" )
-			mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-			mycmakeargs+=( "-DWITH_CUFFT=ON" )
-		fi
-	else
-		mycmakeargs+=( "-DWITH_CUDA=OFF" )
-		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-	fi
-
-	if 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
-	mycmakeargs+=(
-		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-		"-DBUILD_LATEX_DOCS=OFF"
-		"-DBUILD_PACKAGE=OFF"
-		"-DENABLE_PROFILING=OFF"
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		"-DCMAKE_SKIP_RPATH=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
-}