Try to consolidate python test and doc useflags by REQUIRED_USE usage. Add patches where needed...

(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)

3 files changed, 64 insertions, 0 deletions

diff --git a/media-libs/vigra/files/1.7.1-fix-nosetest.patch b/media-libs/vigra/files/1.7.1-fix-nosetest.patch
new file mode 100644
index 000000000000..b75b8698e403
--- /dev/null
+++ b/media-libs/vigra/files/1.7.1-fix-nosetest.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..5f236f76f9ac
--- /dev/null
+++ b/media-libs/vigra/files/1.7.1-fix-tests.patch
@@ -0,0 +1,11 @@
+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-numpy_doc.patch b/media-libs/vigra/files/1.7.1-numpy_doc.patch
new file mode 100644
index 000000000000..b112395e8a6b
--- /dev/null
+++ b/media-libs/vigra/files/1.7.1-numpy_doc.patch
@@ -0,0 +1,27 @@
+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)