old

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

11 files changed, 16 insertions, 470 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index 5cc953e79ca7..b0cb1f913ff5 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.58 2013/04/12 07:52:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.59 2013/04/12 08:14:47 ssuominen Exp $
+
+  12 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/1.7.1-automagicness.patch, -files/1.7.1-fix-nosetest.patch,
+  -files/1.7.1-fix-tests.patch, -files/1.7.1-gcc4.6.patch,
+  -files/1.7.1-png-1.5.patch, -files/1.7.1-hdf5.patch, -vigra-1.7.1.ebuild,
+  -files/1.7.1-numpy_doc.patch, -vigra-1.7.1-r1.ebuild:
+  old
 
 *vigra-1.8.0-r1 (12 Apr 2013)
 
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 41b606467dbf..8535106db35b 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,32 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.7.1-automagicness.patch 1608 SHA256 8d6d73ff40155cd34eff25ff8f32c8bd25f32d63264548b3262fb8b788526957 SHA512 3450c90152ce3b6104fa7a6b2788795909783b4c1d5476f1d1efa36d085d679b905964516824ece3bdb017ee99e1e1a105e1c9c809ea0fec7839f8bd1d3dc9e5 WHIRLPOOL 51653d70714608a9746f87fe53db136be505bf94f9187bfba37445e6352a29b555b67739fad066b85791896e0f6c48d0e7886007d882d48d42b9a9ddaf822baf
-AUX 1.7.1-fix-nosetest.patch 1506 SHA256 21ad06a9cf2c0f0c48531be7209e1879dc57e6204717df20e4dcb3c1e8053a8c SHA512 a606c654676df575b3e25cee8ccafcfa02df83d5be3ac50d137813432f16b301906f8d55bc1e4f6a533006923225a9b3d295e97c46f931ca165ad966d1875f2f WHIRLPOOL e02b3f3eb9a15b58c50d712204fbdd605fbaeb83d1f57dc2c3120f8eb6d3466be5add58ad806f8e20c5d39bcb14608a810ffde9e81202e852f7ad6d781b4940f
-AUX 1.7.1-fix-tests.patch 501 SHA256 c6fbd7051dc9e5afff3a0c6645bf1e99d66fe6be4bad7990df67ca4013bfc33a SHA512 da0c50e761210a77bb1997c3368eb637bb1dcfd55b92e898c7ccc771b997e66239852548c62792d590fa685dd42cc3c296b572ef2887d5b46a3d445de850c136 WHIRLPOOL f90ffbb8cdb28b195272f0a12751ad3c5753b6f0143c8a0bada94804e0ab274c9ea496ab91bcc9a19fe9cb835762d5846f83bc499fbdadcbf92400974295e849
-AUX 1.7.1-gcc4.6.patch 1296 SHA256 321c50a65c6a7d94706e5018ccb2efd3aacd754910401e13b62590e7e7c0ee23 SHA512 d70bf2432b7d7217f9e24e89b6a571023577af04e05d04bfbf2788854453ba56a683f8bf2a65d58b2ada77a38884a8b259d279ccdb2fcdfbfa08c430ea3dc9c5 WHIRLPOOL 77096181de9fd4ce42b48ec5dc882a281bb63175f55d1ce71889b86ade8131a6adb6908312c5435373cdb0f2973fdb9bb32abcddeeb52c888efe3fe0fe77b39c
-AUX 1.7.1-hdf5.patch 1290 SHA256 ec366d57999b7353fd57c9095c4bf88323639195ba5edd6c67a0ebb7b42a50f0 SHA512 50975206ad0823c1feb7f47b9c7cd392f447aab24b8bf69b2d116c992627660c06730619735151f9988ccd43edfa4837ae6f943b1618ce552d7481f9e20fc1b2 WHIRLPOOL eda3f2b3c7df66fe49635cc995611187dadab2f6c06de7c23276e3f508448707e832174075ac19d1cdf4edd64d1fa5001a34d91a02f491faaef9ebd6168eac49
-AUX 1.7.1-numpy_doc.patch 996 SHA256 bb764e22b8af92d107e87a36e40e7c287189397adbc8e5de76c69ba3d8aeb555 SHA512 74a8e5f491a29152c011bb0f948e1f9f4e2035829424d143816cfbf853a1c53f65f6e7f92b108fd28e823332fa457ada6647f4e7edd2d87d1885e8bd4bbf5dcb WHIRLPOOL 24f03998403dcd5295b2ed7e8e071894d6dd8ed55416b3e07b2d251e948c51c2ec32fb9a1bdd8ba69af5c6407f2a977f1687d50a4a81d87e04798598422df6fd
-AUX 1.7.1-png-1.5.patch 1259 SHA256 28e1fa88143bdda03dadde5dfa43e1c86e38e338907e12d0e7cb23d5c6b85c68 SHA512 254e428aa89eff861eb9c2ba765ba760d456905ae2a22964bd2fcf3bcbbd752e0c6b42201a4fa438ac881d4292dd22fb3d7a6c76c5708f0a6823ffa854cd7025 WHIRLPOOL 43486cca7342fdd6f96b838186f446d949e1dc7ed229f5eec4ce57acfcd4a7ca9da3de1d0cae32e1109826e2b1d0ec54322caca29f87075640de9e5159cfb44f
 AUX vigra-1.8.0-automagicness.patch 1509 SHA256 55b89813234db00209c5c7c5f191861e6e3a0d363006acf972311ad4c3b0cd2c SHA512 a460f6764fff98e4e982863b2444f8ec832506b9c75695b721214ffde28831a8d9828985929eded72ad4f36b0963a6c93434313a3ec801ca244a66eda74cd55d WHIRLPOOL 385a939d54dc73ba50c9be7fc89defdf1d1c28a31fe33e16dfc459ce9d6231f3dc3671a80dbe3623bda56862e7af02975c9d911185d13f62f2d4d6d3ad8b7d36
 AUX vigra-1.8.0-gcc47.patch 951 SHA256 d5639c277d8e1504ea37a492c505dffe85db7285bed1a4de37a92698f2b1aaab SHA512 a05f7b2ba49b3241bba92b4483dd57c34b5ff51d71d274817e3967cf8346d5156d8179f3c0e98939ae6318c4b1cde2d5b9766a1e949a3c0ec991f8262551fbcb WHIRLPOOL 7bdce572c8ea23e887e2cd3e6f7a323ac70e09b1c2aeadcd7720ab38044643e3c9daefcc484eb03132a1d822ac3ab182986cd08d04408b8d8882159e58d0fdc2
 AUX vigra-1.8.0-numpy_doc.patch 990 SHA256 799527eba516607956030487b084f99f47037cc928a0ab84fec86bc9c00074f6 SHA512 da5f73c2d18735be63e3e1637b14fb243e509f6c0e7988acc75eccb41e41d3b16b2b8f241b21da517d0e7a454d6be58e1585015d9ce6908e6863bfe0790a5049 WHIRLPOOL a086912ef98565a2fa177f2de19bc26c699ccc2393a7d5d073152f9763913951457cf6e1557d1ddc12387cd126bfd74b5c054f663c09ecdff7a6e4d31aee49e5
-DIST vigra-1.7.1-src.tar.gz 28481160 SHA256 4fe9052085330300f8c8564021b67fc2c5d534132ef29e781d839feb5d5c0ec2 SHA512 20a4053499e22a8f202ae000a8401a9ce19771a58ad1fe21ea961d1bd5cf0ebcd7fbfe81a0bea423fb5e96fd8fb2fb26766a6f33d4c94bca49f75c81ffe92a1f WHIRLPOOL 667545a01a96606400c30d0aa2bcc8b033e8353d032e8efbecf01009ae5359e0aa1f6263841d040cc6f28ebed54e08f06d32888b03faa340e8e5b8a0152d7bf4
 DIST vigra-1.8.0-src.tar.gz 29814914 SHA256 fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214 SHA512 a7de19bd7e24442fa488053ff16e54c7b1789a2836069a94a2f5a77e8dd7e9aa246667034d582eb98b1b396ffe4f860d1a87436f804d5256e916cc860c973de1 WHIRLPOOL 002d4cb5a74741db53e4215888357a68c39680632059f3e83e1f67e820a99a48b15c0f0ebde5aea8ba50dd53a7c80d4408c1dab32bdfeb6f1c3c95685597f3e0
-EBUILD vigra-1.7.1-r1.ebuild 2847 SHA256 2de86ad6bc1334f43d8c7e16bb7e2217924e8a3008ca73ed350f4fdd4dceec21 SHA512 70c111222a7cfcacf69ac717bb5a53bf814a32dc873719977c527dbd2ca4e7549f1476ccffef41a06f284293682e7a2d3306427f0ea403eb315e74e461245e2c WHIRLPOOL cd6431f39973e80e53b08ff8d37c73b8b7f08da6b36bb02f587aed597cf0e9084f6871297d7bcc8aa61691ab1b381d853a315e0b0133175339cf2ba42466fa74
-EBUILD vigra-1.7.1.ebuild 2410 SHA256 a0bbed02f61c660df3134b2f09733639e0e5a1152b08931fb1d66894118d004d SHA512 ae33491b2eb1dcf9324bed677ae69e1b3093b8396eb9e7b0d97d21cf7d4d5f343d831cdc6799046d5af62bb8bb614a8ec21546952ff92553ce4f3a3a94285813 WHIRLPOOL a9602fab43fa4c6d95c38ecd109a5f5abad007685c5af017e26850fd4a50069157a4d5573957370d1d664c96a87291ef3fa5d137b687dd45070c50edc47e1815
 EBUILD vigra-1.8.0-r1.ebuild 3094 SHA256 4a9efef8fc6d258e92279cebea250069f99fe57ba5fb39b950d4001a5f4f3637 SHA512 11076c86766af283599626d9b4e36bd6730529388b1be6d35bac46e699d056dab67953ab6fdf9227a96a7803a36728086b570ed70c988e9cee5332eea6601d4e WHIRLPOOL 07c0d450fd5993cb2f5db831283b159a3fb3956cff056ab9abb188e84e6996ab2da86037bf3347867eec7fc2d1fb7b737bc93ea56b09b8cbe2711bf4ed2a88b2
 EBUILD vigra-1.8.0.ebuild 2782 SHA256 68381d99ea67f61481f8d98333a9ca063cf657b5ef4993e831847d960f631943 SHA512 eb5773a44f026424d9bb478d5fbfc6856c26db6b1167be9bbe189ffb3ef9053b4819db8931bee555686e8651a1faeb3805ca6320a0253f6ab0efaa4316eca251 WHIRLPOOL f5a0045c703cf5be8b09ee66320a736723a26e82448d590a171e9cd23b95e5a35d0ddb3344a4ae8148da5505753a2e5f6a4c0eb4a9246dd8df7b730728304e84
-MISC ChangeLog 8452 SHA256 04ddb120563bd5d2a8c660996bf5b02137f0473c4a3be9b312dc0321e6e20abf SHA512 b666d71cdd39c3637bcde97779b034c9545140b2d3256c347d8ad63f5c6f1fc57b1013cf63adaf79fe65ef393b23d9a0c62de288359b2c40e941777205ce93d3 WHIRLPOOL dc5098ace30b94643e22edb64a2a654613ccb94f96af56683abb3826cc588b14012ef058b329595633c01cef8e21f0ceeead055bc411485e7f3b26f5e2e06dcf
+MISC ChangeLog 8773 SHA256 4e9b1ea875f219f116519803e1b6958967419699a03fcc76b34bb7bc2736ecd9 SHA512 dc94bd5da5d45d057c155b28aeb48a3f8d7e8dc653d0e02c6b58bac775f6ddf6e62e2dd6baafad88929d05dd67ad0fa0dccb116bdfa3813abca00d68c0c4d236 WHIRLPOOL 7ce1027af5ab948a31937e0bc0a65bfb4361c88d6ee62cf2014c22d041af078f6878c17ae0bf19674d878ee33cc5c4c204ca8b5df300e8528911b0dad95ab3bb
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRZ71HAAoJEEdUh39IaPFN/wQH/j0tl7mTo0VcAlFdcESkqsIc
-r0jeWWOqF0Wbp1XlH//guXW03L3EnZE6fkKLIE9AJ7Y2eS0Xg948RY44mckKWvFk
-s07gHyuRmooZ2krlD/7NHY36x6kqdLXBuakeSMflagEI+AIr2NPHi+bx4xE7waaV
-AD2bcz7ZnRwzqpxL4U4/vghmOWLwAfeWqsgYV58XEdaTTHbN9e69EJXBI+XSHp6f
-/nmNJMosP9vKtMsISOcsTpldBeMp8ghBoLhlgy5QXclUgoe8/oJ5RK0fbM4PlQ7D
-Hj6nrWjpo1CVN7YH6gfBLMOo7ZTvK5AJkWb824NfSQGWTf4QVAvoBgw2FDsLqGs=
-=4K8V
+iQEcBAEBCAAGBQJRZ8JpAAoJEEdUh39IaPFN2cUIAI0sw6DG0CVraGBlFg35FkyY
++z2YTWjaHf+4URn+3gNX/GkY/me3AA9tNvyTcz7pLmCygcILKc5lex7caa26qPaX
+fwyuG1Cid98MyCnIu4YaE1HLfSoInvFoiPnh83cMJBHiXxDcpNZ8W5EwrbILGIVt
+iE1+kZN7tQnraipWh95SqgbDCFcn2+rn6G0YFdTUHnFzhqLUaDr++uzhebVVc/uE
+ZrdkcB/8kI7Rngd1SoeTGt64dO6ZvFzyaiW70yRgSYXrX//iiADX3MHR4M3anNqX
+MM816G1wCBhay6xLcDtg7OSuwWN6ZvELFR2kMujSOx3IyUewZDVaZCyPRWazUW8=
+=fYF2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/1.7.1-automagicness.patch b/media-libs/vigra/files/1.7.1-automagicness.patch
deleted file mode 100644
index e2a518c45e03..000000000000
--- a/media-libs/vigra/files/1.7.1-automagicness.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN vigra-1.7.1.old/CMakeLists.txt vigra-1.7.1/CMakeLists.txt
---- vigra-1.7.1.old/CMakeLists.txt	2011-03-31 19:32:42.000000000 +0200
-+++ vigra-1.7.1/CMakeLists.txt	2011-03-31 19:39:51.000000000 +0200
-@@ -38,16 +38,32 @@
- ##################################################
- 
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3)
-+
-+option(WITH_TIFF "Enable tiff support" ON)
-+option(WITH_JPEG "Enable jpeg support" ON)
-+option(WITH_PNG "Enable png support" ON)
-+option(WITH_FFTW3 "Enable fftw support" ON)
-+option(ENABLE_DOC "Build documentation" ON)
-+if(WITH_TIFF)
-+	VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+endif()
-+if(WITH_JPEG)
-+	VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+endif()
-+if(WITH_PNG)
-+	VIGRA_FIND_PACKAGE(PNG)
-+endif()
-+if(WITH_FFTW3)
-+	VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3)
-+endif()
- IF(WITH_HDF5)
-     VIGRA_FIND_PACKAGE(HDF5)
- ENDIF()
- 
--FIND_PACKAGE(Doxygen)
--FIND_PACKAGE(PythonInterp)
-+IF(ENABLE_DOC)
-+	FIND_PACKAGE(Doxygen)
-+	FIND_PACKAGE(PythonInterp)
-+ENDIF()
- 
- IF(WITH_VIGRANUMPY)
-     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-@@ -267,10 +283,4 @@
-   MESSAGE( STATUS "  vigranumpy will NOT be installed" )
- ENDIF()
- 
--IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR
--   NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND)
--  MESSAGE( STATUS "" )
--  MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing libraries" )
--ENDIF()
--
- MESSAGE( STATUS "---------------------------------------------------------" )
diff --git a/media-libs/vigra/files/1.7.1-fix-nosetest.patch b/media-libs/vigra/files/1.7.1-fix-nosetest.patch
deleted file mode 100644
index b75b8698e403..000000000000
--- a/media-libs/vigra/files/1.7.1-fix-nosetest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/vigra/noise_normalization.hxx b/include/vigra/noise_normalization.hxx
-index 8758cde..344a601 100644
---- a/include/vigra/noise_normalization.hxx
-+++ b/include/vigra/noise_normalization.hxx
-@@ -583,6 +583,9 @@ void noiseVarianceListMedianCut(Vector1 const & noise, Vector2 & clusters,
-         for(unsigned int k=0; k < clusters.size(); ++k)
-         {
-             int k1 = clusters[k][0], k2 = clusters[k][1]-1;
-+            
-+#if 0       // turned the "internal error" in a postcondition message
-+            // for the most likely case
-             std::string message("noiseVarianceListMedianCut(): internal error (");
-             message += std::string("k: ") + asString(k) + ", ";
-             message += std::string("k1: ") + asString(k1) + ", ";
-@@ -590,6 +593,11 @@ void noiseVarianceListMedianCut(Vector1 const & noise, Vector2 & clusters,
-             message += std::string("noise.size(): ") + asString(noise.size()) + ", ";
-             message += std::string("clusters.size(): ") + asString(clusters.size()) + ").";
-             vigra_invariant(k1 >= 0 && k1 < (int)noise.size() && k2 >= 0 && k2 < (int)noise.size(), message.c_str());
-+#endif
-+            
-+            vigra_postcondition(k1 >= 0 && k1 < (int)noise.size() && 
-+                                k2 >= 0 && k2 < (int)noise.size(), 
-+                "noiseVarianceClustering(): Unable to find homogeneous regions.");
- 
-             double diff = noise[k2][0] - noise[k1][0];
-             if(diff > diffMax)
diff --git a/media-libs/vigra/files/1.7.1-fix-tests.patch b/media-libs/vigra/files/1.7.1-fix-tests.patch
deleted file mode 100644
index 5f236f76f9ac..000000000000
--- a/media-libs/vigra/files/1.7.1-fix-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN vigra-1.7.1.old/test/utilities/test.cxx vigra-1.7.1/test/utilities/test.cxx
---- vigra-1.7.1.old/test/utilities/test.cxx	2011-09-04 17:13:53.362610527 +0200
-+++ vigra-1.7.1/test/utilities/test.cxx	2011-09-04 17:27:55.772600423 +0200
-@@ -33,6 +33,7 @@
- /*                                                                      */
- /************************************************************************/
- 
-+#include <cstddef>
- #include <iostream>
- #include <iterator>
- #include "unittest.hxx"
diff --git a/media-libs/vigra/files/1.7.1-gcc4.6.patch b/media-libs/vigra/files/1.7.1-gcc4.6.patch
deleted file mode 100644
index e8959860035a..000000000000
--- a/media-libs/vigra/files/1.7.1-gcc4.6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/include/vigra/sifImport.hxx	2011-04-10 09:36:12.735845000 -0500
-+++ b/include/vigra/sifImport.hxx	2011-04-10 09:36:41.805845002 -0500
-@@ -58,6 +58,7 @@
- #include <cstring>
- #include <vector> 
- #include "vigra/multi_array.hxx"
-+#include <cstddef>
- 
- namespace vigra {
-  
-@ -43,6 +43,7 @@
- #include <set>
- #include <list>
- #include <numeric>
-+#include <stddef.h>
- #include "mathutil.hxx"
- #include "array_vector.hxx"
- #include "sized_int.hxx"
-diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx
---- vigra-1.7.1.old/include/vigra/sifImport.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/sifImport.hxx	2011-01-28 00:23:31.000000000 +0000
-@@ -57,6 +57,7 @@
- #include <fstream>
- #include <cstring>
- #include <vector> 
-+#include <stddef.h>
- #include "vigra/multi_array.hxx"
- 
- namespace vigra {
-diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx
---- vigra-1.7.1.old/include/vigra/multi_iterator.hxx	2010-12-03 17:40:34.000000000 +0000
-+++ vigra-1.7.1/include/vigra/multi_iterator.hxx	2011-01-28 00:23:31.000000000 +0000
-@@ -41,6 +41,7 @@
- #define VIGRA_MULTI_ITERATOR_HXX
- 
- #include <sys/types.h>
-+#include <stddef.h>
- #include "tinyvector.hxx"
- #include "iteratortags.hxx"
- 
diff --git a/media-libs/vigra/files/1.7.1-hdf5.patch b/media-libs/vigra/files/1.7.1-hdf5.patch
deleted file mode 100644
index b930656a0e97..000000000000
--- a/media-libs/vigra/files/1.7.1-hdf5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN vigra-1.7.1.old/include/vigra/random_forest/rf_visitors.hxx vigra-1.7.1/include/vigra/random_forest/rf_visitors.hxx
---- vigra-1.7.1.old/include/vigra/random_forest/rf_visitors.hxx	2011-03-31 19:32:42.000000000 +0200
-+++ vigra-1.7.1/include/vigra/random_forest/rf_visitors.hxx	2011-03-31 20:15:28.000000000 +0200
-@@ -860,6 +860,7 @@
-     ArrayVector< int>           indices; 
-     OOB_Error() : VisitorBase(), oob_breiman(0.0) {}
- 
-+#ifdef HasHDF5
-     void save(std::string filen, std::string pathn)
-     {
-         if(*(pathn.end()-1) != '/')
-@@ -869,6 +870,7 @@
-         temp[0] = oob_breiman;
-         writeHDF5(filename, (pathn + "breiman_error").c_str(), temp);
-     }
-+#endif // HasHDF5
-     // negative value if sample was ib, number indicates how often.
-     //  value >=0  if sample was oob, 0 means fail 1, corrrect
- 
-@@ -1056,6 +1058,7 @@
- 
- 	/** save to HDF5 file
- 	 */
-+#ifdef HasHDF5
-     void save(std::string filen, std::string pathn)
-     {
-         if(*(pathn.end()-1) != '/')
-@@ -1074,6 +1077,7 @@
-         temp[0] = oob_per_tree2;
-         writeHDF5(filename, (pathn + "ulli_error").c_str(), temp);
-     }
-+#endif // HasHDF5
-     // negative value if sample was ib, number indicates how often.
-     //  value >=0  if sample was oob, 0 means fail 1, corrrect
- 
diff --git a/media-libs/vigra/files/1.7.1-numpy_doc.patch b/media-libs/vigra/files/1.7.1-numpy_doc.patch
deleted file mode 100644
index b112395e8a6b..000000000000
--- a/media-libs/vigra/files/1.7.1-numpy_doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN vigra-1.7.1.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.7.1/vigranumpy/docsrc/CMakeLists.txt
---- vigra-1.7.1.old/vigranumpy/docsrc/CMakeLists.txt	2011-09-04 17:13:53.362610527 +0200
-+++ vigra-1.7.1/vigranumpy/docsrc/CMakeLists.txt	2011-09-04 17:18:03.282607530 +0200
-@@ -1,4 +1,4 @@
--IF(PYTHON_SPHINX)
-+IF(PYTHON_SPHINX AND ENABLE_DOC)
- 	# vigranumpy documentation generation using sphinx
- 	IF(DEFINED VIGRANUMPY_DOCDIR)
- 		MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.")
-@@ -33,7 +33,7 @@
- 			${VIGRANUMPY_DOCDIR}
- 		COMMENT "Generating vigranumpy documentation")
- 
--ELSE(PYTHON_SPHINX)
-+ELSE(PYTHON_SPHINX AND ENABLE_DOC)
- 	# no vigranumpy documentation if sphinx not available
- 	ADD_CUSTOM_TARGET (doc_python 
- 		${CMAKE_COMMAND} -E echo
-@@ -41,7 +41,7 @@
- 		"(sphinx-build not found)"
-         VERBATIM)
- 
--ENDIF(PYTHON_SPHINX)
-+ENDIF(PYTHON_SPHINX AND ENABLE_DOC)
- 
- ADD_DEPENDENCIES(doc_python vigranumpy)
- ADD_DEPENDENCIES(doc_python doc_cpp)
diff --git a/media-libs/vigra/files/1.7.1-png-1.5.patch b/media-libs/vigra/files/1.7.1-png-1.5.patch
deleted file mode 100644
index 3fe6448b9ad9..000000000000
--- a/media-libs/vigra/files/1.7.1-png-1.5.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
-# Date 1299851742 -3600
-# Node ID c3a55cf81b34ae5e71e14b1dc90ece7e646a02dd
-# Parent  90494fd71974b95c61181a47580f4d1f02642723
-update for libpng 1.5 (fix by Mark Brand, mingw-cross-env)
-
-diff -r 90494fd71974 -r c3a55cf81b34 src/impex/png.cxx
---- a/src/impex/png.cxx	Thu Mar 10 18:47:50 2011 +0100
-+++ b/src/impex/png.cxx	Fri Mar 11 14:55:42 2011 +0100
-@@ -320,7 +320,11 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
-         char * dummyName;
-         int dummyCompType;
-+#if (PNG_LIBPNG_VER < 10500)
-         char * profilePtr;
-+#else
-+        png_byte * profilePtr;
-+#endif
-         png_uint_32 profileLen;
-         if (png_get_valid( png, info, PNG_INFO_iCCP )) {
-             png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-@@ -593,7 +597,11 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, (png_charp)("icc"), 0,
-+#if (PNG_LIBPNG_VER < 10500)
-                          (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#else
-+                         (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#endif
-         }
- #endif
- 
-
diff --git a/media-libs/vigra/vigra-1.7.1-r1.ebuild b/media-libs/vigra/vigra-1.7.1-r1.ebuild
deleted file mode 100644
index fcf6fcc819a5..000000000000
--- a/media-libs/vigra/vigra-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1-r1.ebuild,v 1.13 2012/07/04 09:05:57 jdhore Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH_OPT="python"
-PYTHON_USE_WITH="threads xml"
-
-MY_P=${P}-src
-
-inherit base cmake-utils multilib python
-
-DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +fftw +hdf5 +jpeg +png +python test +tiff"
-
-RDEPEND="
-	dev-libs/boost[python?]
-	fftw? ( >=sci-libs/fftw-3 )
-	hdf5? ( sci-libs/hdf5 )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng:0 )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/sphinx )
-	)
-	test? (
-		python? ( dev-python/nose )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.7.1-png-1.5.patch"
-	"${FILESDIR}/1.7.1-automagicness.patch"
-	"${FILESDIR}/1.7.1-hdf5.patch"
-	"${FILESDIR}/1.7.1-gcc4.6.patch"
-	"${FILESDIR}/1.7.1-numpy_doc.patch"
-	"${FILESDIR}/1.7.1-fix-tests.patch"
-	"${FILESDIR}/1.7.1-fix-nosetest.patch"
-)
-
-REQUIRED_USE="
-	doc? ( hdf5 fftw )
-	python? ( hdf5 )
-	test? ( hdf5 python fftw )
-"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-DOCS=(README.txt)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# Don't build nor install API docs when not requested
-	use doc || sed -e '/ADD_SUBDIRECTORY(docsrc)/d' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-
-	# required for ddocdir
-	_check_build_dir init
-	# vigranumpy needs python and if enabled it ooms
-	# doc needs doxygen and python
-	# walgrind no use for us since we restrict test
-	# $(cmake-utils_use_with valgrind VALGRIND)
-	local mycmakeargs=(
-		"-DDOCDIR=${CMAKE_BUILD_DIR}/doc"
-		"-DLIBDIR_SUFFIX=${libdir/lib}"
-		"-DDOCINSTALL=share/doc/${PF}"
-		"-DWITH_VALGRIND=OFF"
-		$(cmake-utils_use_with python VIGRANUMPY)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with hdf5)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use test CREATE_CTEST_TARGETS)
-		$(cmake-utils_use test AUTOBUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# drop useless cmake files from libdir
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN}/
-}
-
-src_test() { : ; }
-# bug 390447
-
-pkg_postinst() {
-	use python && python_mod_optimize vigra
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup vigra
-}
diff --git a/media-libs/vigra/vigra-1.7.1.ebuild b/media-libs/vigra/vigra-1.7.1.ebuild
deleted file mode 100644
index 7db4ed1a40b1..000000000000
--- a/media-libs/vigra/vigra-1.7.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.7.1.ebuild,v 1.12 2012/02/19 22:46:18 dilfridge Exp $
-
-EAPI=4
-
-MY_P=${P}-src
-inherit base cmake-utils multilib
-
-DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
-HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="doc +fftw +hdf5 +jpeg +png +python test +tiff"
-
-RDEPEND="
-	dev-libs/boost[python?]
-	fftw? ( >=sci-libs/fftw-3 )
-	hdf5? ( sci-libs/hdf5 )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
-	python? (
-		|| ( dev-lang/python:2.6 dev-lang/python:2.7 )
-	)
-	tiff? ( media-libs/tiff )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/sphinx )
-	)
-	test? (
-		python? ( dev-python/nose )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.7.1-png-1.5.patch"
-	"${FILESDIR}/1.7.1-automagicness.patch"
-	"${FILESDIR}/1.7.1-hdf5.patch"
-	"${FILESDIR}/1.7.1-gcc4.6.patch"
-	"${FILESDIR}/1.7.1-numpy_doc.patch"
-	"${FILESDIR}/1.7.1-fix-tests.patch"
-	"${FILESDIR}/1.7.1-fix-nosetest.patch"
-)
-
-REQUIRED_USE="
-	doc? ( hdf5 fftw )
-	python? ( hdf5 )
-	test? ( hdf5 python fftw )
-"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local libdir=$(get_libdir)
-
-	# required for ddocdir
-	_check_build_dir init
-	# vigranumpy needs python and if enabled it ooms
-	# doc needs doxygen and python
-	# walgrind no use for us since we restrict test
-	# $(cmake-utils_use_with valgrind VALGRIND)
-	local mycmakeargs=(
-		"-DDOCDIR=${CMAKE_BUILD_DIR}/doc"
-		"-DLIBDIR_SUFFIX=${libdir/lib}"
-		"-DDOCINSTALL=share/doc/${PF}"
-		"-DWITH_VALGRIND=OFF"
-		$(cmake-utils_use_with python VIGRANUMPY)
-		$(cmake-utils_use_enable doc DOC)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with hdf5)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use test CREATE_CTEST_TARGETS)
-		$(cmake-utils_use test AUTOBUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# drop useless cmake files from libdir
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN}/
-}
-
-src_test() { : ; }
-# bug 390447