proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

12 files changed, 832 insertions, 0 deletions

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
new file mode 100644
index 000000000000..d26e5316ae46
--- /dev/null
+++ b/media-libs/vigra/Manifest
@@ -0,0 +1,2 @@
+DIST vigra-1.10.0-src-with-docu.tar.gz 36122311 SHA256 42d4a361b0bb52fbfdae7e76000698be04dabba77be3f4248d369139fe96a099 SHA512 4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d WHIRLPOOL 92cf1517acc6ff11eb255cb6bee523ebcaab118b9f73602baf07be8070c537c5bb7e94a9ccbd97bd7e20e20efeb8ac485a184f1c3609fe7747051ed6ec4ca65f
+DIST vigra-1.9.0-src.tar.gz 30813416 SHA256 8fbdccb553a4925323098ab27b710fbc87d48f37bf81d404994936a31a31cf01 SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 WHIRLPOOL 12c63119133a6a7e6a6d28078b9267f720e98b8754b416d0491b93ee87f3527cffe77bc043c00cdf729633c1161bdc11bdfe4cff57a73345c9addd1bd6cc62d9
diff --git a/media-libs/vigra/files/vigra-1.10.0-automagicness.patch b/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
new file mode 100644
index 000000000000..182f40e2c879
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
@@ -0,0 +1,64 @@
+Description: Optional jpeg/tiff/fftw/png dependencies
+Forwarded: not-needed
+Last-Update: 2013-12-11
+
+Index: vigra-1.10.0/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/CMakeLists.txt
++++ vigra-1.10.0/CMakeLists.txt
+@@ -59,11 +59,24 @@ ENDIF ()
+ ##################################################
+ 
+ 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 libfftw-3.3)
+-VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.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 libfftw-3.3)
++	VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
++ENDIF()
+ 
+ IF(WITH_OPENEXR)
+     VIGRA_FIND_PACKAGE(OpenEXR)
+@@ -85,9 +98,11 @@ IF(WITH_LEMON)
+     VIGRA_FIND_PACKAGE(LEMON)
+ ENDIF()
+ 
+-SET(DOXYGEN_SKIP_DOT TRUE)
+-FIND_PACKAGE(Doxygen)
+-FIND_PACKAGE(PythonInterp)
++IF(ENABLE_DOC)
++	SET(DOXYGEN_SKIP_DOT TRUE)
++	FIND_PACKAGE(Doxygen)
++	FIND_PACKAGE(PythonInterp)
++ENDIF()
+ 
+ IF(WITH_VIGRANUMPY)
+     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
+@@ -388,10 +403,4 @@ ELSE()
+   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/vigra-1.10.0-cmake-scripts.patch b/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
new file mode 100644
index 000000000000..dc3a72e43e66
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
@@ -0,0 +1,53 @@
+Description: Fix location of installed cmake scripts
+Author: Jens-Malte Gottfried <jmgottfried@web.de>
+Forwarded: not-needed
+Last-Update: 2013-12-11
+
+Index: vigra-1.10.0/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/CMakeLists.txt
++++ vigra-1.10.0/CMakeLists.txt
+@@ -276,10 +276,10 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/con
+ 
+ # export targets:
+ INSTALL(EXPORT vigra-targets
+-        DESTINATION lib${LIB_SUFFIX}/vigra)
++        DESTINATION lib${LIB_SUFFIX}/cmake/Vigra)
+ INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfig.cmake
+             ${PROJECT_BINARY_DIR}/lib/vigra/CMake/VigraConfigVersion.cmake
+-        DESTINATION lib${LIB_SUFFIX}/vigra)
++        DESTINATION lib${LIB_SUFFIX}/cmake/Vigra)
+ EXPORT(TARGETS vigraimpex FILE vigra-targets.cmake)
+ 
+ ##################################################
+Index: vigra-1.10.0/config/VigraConfig.cmake.in
+===================================================================
+--- vigra-1.10.0.orig/config/VigraConfig.cmake.in
++++ vigra-1.10.0/config/VigraConfig.cmake.in
+@@ -1,5 +1,5 @@
+ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(Vigra_TOP_DIR  "${SELF_DIR}/../../" ABSOLUTE)
++get_filename_component(Vigra_TOP_DIR  "${SELF_DIR}/../../../" ABSOLUTE)
+ 
+ include(${SELF_DIR}/vigra-targets.cmake)
+ get_target_property(VIGRA_TYPE vigraimpex TYPE)
+@@ -9,6 +9,6 @@
+ endif(${VIGRA_TYPE} STREQUAL "STATIC_LIBRARY")
+ get_filename_component(Vigra_INCLUDE_DIRS "${Vigra_TOP_DIR}/include/" ABSOLUTE)
+ 
+-IF(EXISTS ${SELF_DIR}/../vigranumpy/VigranumpyConfig.cmake)
+-    INCLUDE(${SELF_DIR}/../vigranumpy/VigranumpyConfig.cmake)
++IF(EXISTS ${SELF_DIR}/VigranumpyConfig.cmake)
++    INCLUDE(${SELF_DIR}/VigranumpyConfig.cmake)
+ ENDIF()
+--- vigra-1.10.0.orig/vigranumpy/CMakeLists.txt
++++ vigra-1.10.0/vigranumpy/CMakeLists.txt
+@@ -53,7 +53,7 @@
+                            COMMENT "Creating vigranumpy setup in ${CMAKE_CURRENT_BINARY_DIR}/dist")        
+     ENDIF()
+     
+-    set(VIGRANUMPY_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/vigranumpy)
++    set(VIGRANUMPY_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/Vigra)
+     
+     set(VIGRANUMPY_INCLUDE_RELATIVE "")
+     foreach(PATH ${CMAKE_INSTALL_PREFIX}/include ${VIGRANUMPY_INCLUDE_DIRS})
diff --git a/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch b/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch
new file mode 100644
index 000000000000..83bb86d1119f
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch
@@ -0,0 +1,230 @@
+Description: Fix build with mpi enabled hdf5 libraries
+Author: Jens-Malte Gottfried <jmgottfried@web.de>
+Forwarded: not-needed
+Last-Update: 2013-12-11
+
+Index: vigra-1.10.0/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/CMakeLists.txt
++++ vigra-1.10.0/CMakeLists.txt
+@@ -63,6 +63,7 @@ OPTION(WITH_TIFF "Enable tiff support" O
+ OPTION(WITH_JPEG "Enable jpeg support" ON)
+ OPTION(WITH_PNG "Enable png support" ON)
+ OPTION(WITH_FFTW3 "Enable fftw support" ON)
++OPTION(WITH_MPI "Link against mpi libraries" ON)
+ OPTION(ENABLE_DOC "Build documentation" ON)
+ IF(WITH_TIFF)
+ 	VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
+@@ -70,6 +71,9 @@ ENDIF()
+ IF(WITH_JPEG)
+ 	VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
+ ENDIF()
++IF(WITH_MPI)
++	VIGRA_FIND_PACKAGE(MPI)
++ENDIF()
+ IF(WITH_PNG)
+ 	VIGRA_FIND_PACKAGE(PNG)
+ ENDIF()
+Index: vigra-1.10.0/src/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/src/impex/CMakeLists.txt
++++ vigra-1.10.0/src/impex/CMakeLists.txt
+@@ -79,7 +79,7 @@ IF(OPENEXR_FOUND)
+ ENDIF(OPENEXR_FOUND)
+ 
+ IF(HDF5_FOUND)
+-  TARGET_LINK_LIBRARIES(vigraimpex ${HDF5_LIBRARIES})
++  TARGET_LINK_LIBRARIES(vigraimpex ${HDF5_LIBRARIES} ${MPI_LIBRARIES})
+ ENDIF(HDF5_FOUND)
+ 
+ INSTALL(TARGETS vigraimpex
+Index: vigra-1.10.0/test/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/CMakeLists.txt
++++ vigra-1.10.0/test/CMakeLists.txt
+@@ -1,4 +1,7 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
++IF(WITH_MPI)
++	INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
++ENDIF()
+ 
+ INCLUDE(VigraAddTest)
+ 
+Index: vigra-1.10.0/test/impex/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/impex/CMakeLists.txt
++++ vigra-1.10.0/test/impex/CMakeLists.txt
+@@ -15,7 +15,7 @@ IF(OPENEXR_FOUND)
+   ADD_DEFINITIONS(-DHasEXR)
+ ENDIF(OPENEXR_FOUND)
+ 
+-VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_impex test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+ VIGRA_COPY_TEST_DATA(lenna.xv lenna_gifref.xv lennafloat.xv lennafloatrgb.xv lennargb.xv no-image.txt lenna_0.tif lenna_1.tif lenna_2.tif lenna_masked_color.tif  lenna_masked_gray.tif)
+ 
+Index: vigra-1.10.0/test/classifier/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/classifier/CMakeLists.txt
++++ vigra-1.10.0/test/classifier/CMakeLists.txt
+@@ -2,13 +2,15 @@ if(HDF5_FOUND)
+     INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
+   
+     ADD_DEFINITIONS(${HDF5_CPPFLAGS} -DHasHDF5)
+-    VIGRA_ADD_TEST(test_classifier test.cxx LIBRARIES vigraimpex ${HDF5_LIBRARIES})
++    VIGRA_ADD_TEST(test_classifier test.cxx
++		LIBRARIES vigraimpex ${HDF5_LIBRARIES} ${MPI_LIBRARIES})
+ else()
+     MESSAGE(STATUS "** WARNING: test_classifier::RFHDF5Test() will not be executed")
+     VIGRA_ADD_TEST(test_classifier test.cxx )
+ endif()
+ 
+-VIGRA_ADD_TEST(classifier_speed_comparison speed_comparison.cxx)
++VIGRA_ADD_TEST(classifier_speed_comparison speed_comparison.cxx
++	LIBRARIES ${MPI_LIBRARIES})
+ 
+ add_subdirectory(data)
+ 
+Index: vigra-1.10.0/test/imgproc/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/imgproc/CMakeLists.txt
++++ vigra-1.10.0/test/imgproc/CMakeLists.txt
+@@ -1,3 +1,9 @@
+-VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_imgproc test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+-VIGRA_COPY_TEST_DATA(lenna128.xv lenna128rgb.xv splineimageview2.xv splineimageview3.xv splineimageview5.xv lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv lennargb42IIR.xv lenna_rotate.xv)
++VIGRA_COPY_TEST_DATA(
++	lenna128.xv lenna128rgb.xv
++	splineimageview2.xv splineimageview3.xv splineimageview5.xv
++	lenna42lin.xv lenna288neu.xv lenna42neu.xv lenna288rgbneu.xv
++	lenna42rgbneu.xv lenna367FIR.xv lenna42FIR.xv lenna367IIR.xv
++	lenna42IIR.xv lenna42linrgb.xv lennargb42FIR.xv
++	lennargb42IIR.xv lenna_rotate.xv)
+Index: vigra-1.10.0/test/convolution/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/convolution/CMakeLists.txt
++++ vigra-1.10.0/test/convolution/CMakeLists.txt
+@@ -1,3 +1,11 @@
+-VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_convolution test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+-VIGRA_COPY_TEST_DATA(lenna128.xv lenna_simple_sharpening_orig.xv lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv lennahessxx.xv lennastxx.xv lenna128recgrad.xv lenna128nonlinear.xv resampling.xv lennahessyy.xv lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv lenna_level1.xv lenna_level2.xv lenna_levellap0.xv lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
++VIGRA_COPY_TEST_DATA(
++	lenna128.xv lenna_simple_sharpening_orig.xv
++	lenna_gaussian_sharpening_orig.xv lenna128sepgrad.xv
++	lennahessxx.xv lennastxx.xv lenna128recgrad.xv
++	lenna128nonlinear.xv resampling.xv lennahessyy.xv
++	lennastyy.xv lennahessxy.xv lennastxy.xv lenna128rgb.xv
++	lenna128rgbsepgrad.xv lenna_level-2.xv lenna_level-1.xv
++	lenna_level1.xv lenna_level2.xv lenna_levellap0.xv
++	lenna_levellap1.xv lenna_levellap2.xv lennargbst.xv)
+Index: vigra-1.10.0/test/fourier/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/fourier/CMakeLists.txt
++++ vigra-1.10.0/test/fourier/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ if(FFTW3_FOUND)
+     INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
+ 
+-    VIGRA_ADD_TEST(test_fourier test.cxx LIBRARIES vigraimpex ${FFTW3_LIBRARIES})
++    VIGRA_ADD_TEST(test_fourier test.cxx
++		LIBRARIES vigraimpex ${FFTW3_LIBRARIES} ${MPI_LIBRARIES})
+ 
+     VIGRA_COPY_TEST_DATA(ghouse.gif filter.xv gaborresult.xv)
+ else()
+Index: vigra-1.10.0/test/tensorimaging/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/tensorimaging/CMakeLists.txt
++++ vigra-1.10.0/test/tensorimaging/CMakeLists.txt
+@@ -1,3 +1,7 @@
+-VIGRA_ADD_TEST(test_tensorimaging test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_tensorimaging test.cxx
++	LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+-VIGRA_COPY_TEST_DATA(l2.xv riesz00.xv riesz10.xv riesz01.xv riesz20.xv riesz11.xv riesz02.xv boundaryTensor.xv l2_boundary1.xv l2_boundary.xv l2_hourglass.xv l2_get.xv)
++VIGRA_COPY_TEST_DATA(
++	l2.xv riesz00.xv riesz10.xv riesz01.xv riesz20.xv
++	riesz11.xv riesz02.xv boundaryTensor.xv
++	l2_boundary1.xv l2_boundary.xv l2_hourglass.xv l2_get.xv)
+Index: vigra-1.10.0/test/simpleanalysis/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/simpleanalysis/CMakeLists.txt
++++ vigra-1.10.0/test/simpleanalysis/CMakeLists.txt
+@@ -1,10 +1,12 @@
+ if(FFTW3_FOUND)
+     INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
+     ADD_DEFINITIONS(-DHasFFTW3)
+-    
+-    VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex ${FFTW3_LIBRARIES})
++
++    VIGRA_ADD_TEST(test_simpleanalysis test.cxx
++		LIBRARIES vigraimpex ${FFTW3_LIBRARIES} ${MPI_LIBRARIES})
+ else()
+-    VIGRA_ADD_TEST(test_simpleanalysis test.cxx LIBRARIES vigraimpex)
++	VIGRA_ADD_TEST(test_simpleanalysis test.cxx
++		LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ endif()
+ 
+ VIGRA_COPY_TEST_DATA(noiseNormalizationTest.xv slantedEdgeMTF.xv lenna128.xv)
+Index: vigra-1.10.0/test/image/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/image/CMakeLists.txt
++++ vigra-1.10.0/test/image/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_image test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+ VIGRA_COPY_TEST_DATA(lenna.xv)
+Index: vigra-1.10.0/test/multiarray/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/multiarray/CMakeLists.txt
++++ vigra-1.10.0/test/multiarray/CMakeLists.txt
+@@ -10,6 +10,6 @@ IF(TIFF_FOUND)
+   ADD_DEFINITIONS(-DHasTIFF)
+ ENDIF(TIFF_FOUND)
+ 
+-VIGRA_ADD_TEST(test_multiarray test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_multiarray test.cxx LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/impex)
+Index: vigra-1.10.0/test/multiconvolution/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/multiconvolution/CMakeLists.txt
++++ vigra-1.10.0/test/multiconvolution/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-VIGRA_ADD_TEST(test_multiconvolution test.cxx LIBRARIES vigraimpex)
++VIGRA_ADD_TEST(test_multiconvolution test.cxx
++	LIBRARIES vigraimpex ${MPI_LIBRARIES})
+ 
+ VIGRA_ADD_TEST(test_multiconvolution_speed speedtest.cxx)
+ 
+Index: vigra-1.10.0/test/hdf5impex/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/hdf5impex/CMakeLists.txt
++++ vigra-1.10.0/test/hdf5impex/CMakeLists.txt
+@@ -3,7 +3,8 @@ if(HDF5_FOUND)
+   
+     ADD_DEFINITIONS(${HDF5_CPPFLAGS})
+ 
+-    VIGRA_ADD_TEST(test_hdf5impex test.cxx LIBRARIES vigraimpex ${HDF5_LIBRARIES})
++    VIGRA_ADD_TEST(test_hdf5impex test.cxx
++		LIBRARIES vigraimpex ${HDF5_LIBRARIES} ${MPI_LIBRARIES})
+ else()
+     MESSAGE(STATUS "** WARNING: test_hdf5impex will not be executed")
+ endif()
+Index: vigra-1.10.0/test/sifImport/CMakeLists.txt
+===================================================================
+--- vigra-1.10.0.orig/test/sifImport/CMakeLists.txt
++++ vigra-1.10.0/test/sifImport/CMakeLists.txt
+@@ -4,5 +4,8 @@ if(HDF5_FOUND)
+     ADD_DEFINITIONS(-DHasHDF5 ${HDF5_CPPFLAGS})
+ endif()
+ 
+-VIGRA_ADD_TEST(test_sifImport test.cxx LIBRARIES vigraimpex)
+-VIGRA_COPY_TEST_DATA(testSif_4_16_30001.sif testSif_4_13_30000.sif testSif_4_6_30000.sif testSif_forBlocks_4_16_30001.sif)
++VIGRA_ADD_TEST(test_sifImport test.cxx
++	LIBRARIES vigraimpex ${MPI_LIBRARIES})
++VIGRA_COPY_TEST_DATA(
++	testSif_4_16_30001.sif testSif_4_13_30000.sif
++	testSif_4_6_30000.sif testSif_forBlocks_4_16_30001.sif)
diff --git a/media-libs/vigra/files/vigra-1.8.0-automagicness.patch b/media-libs/vigra/files/vigra-1.8.0-automagicness.patch
new file mode 100644
index 000000000000..8f0c5fff0650
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-automagicness.patch
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b75688..18d01ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,19 +46,38 @@ ENDIF ()
+ ##################################################
+ 
+ INCLUDE(VigraFindPackage)
++option(WITH_TIFF "Enable tiff support" ON)
++option(WITH_JPEG "Enable jpeg support" ON)
++option(WITH_PNG "Enable png support" ON)
++option(WITH_OPENEXR "Enable openexr 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_OPENEXR)
+ VIGRA_FIND_PACKAGE(OpenEXR)
++endif()
++if(WITH_FFTW3)
+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3)
+ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3)
++endif()
+ IF(WITH_HDF5)
+     VIGRA_FIND_PACKAGE(HDF5)
+ ENDIF()
+ 
+ SET(DOXYGEN_SKIP_DOT TRUE)
++if(ENABLE_DOC)
+ FIND_PACKAGE(Doxygen)
+ FIND_PACKAGE(PythonInterp)
++endif()
+ 
+ IF(WITH_VIGRANUMPY)
+     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
+@@ -317,10 +336,4 @@ ELSE()
+   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/vigra-1.8.0-doxygen.patch b/media-libs/vigra/files/vigra-1.8.0-doxygen.patch
new file mode 100644
index 000000000000..c264a67c0172
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-doxygen.patch
@@ -0,0 +1,57 @@
+From a8fd9ff8062152ccdcec7d63f2d5075f29ee2429 Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Wed, 21 Dec 2011 16:31:56 +0100
+Subject: [PATCH] adapted regular expressions for doxygen 1.7.6.1
+
+---
+ docsrc/makeFunctionIndex.py | 4 ++--
+ docsrc/post.py              | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docsrc/makeFunctionIndex.py b/docsrc/makeFunctionIndex.py
+index 55e74bc..06300e2 100644
+--- a/docsrc/makeFunctionIndex.py
++++ b/docsrc/makeFunctionIndex.py
+@@ -119,8 +119,8 @@ def generateFunctionIndex(functionList):
+     text = open(path + "/namespaces.html").read()
+     if text.find('</h1>') > -1: # up to doxygen 1.7.1
+         header = text[:text.find('</h1>')+5]
+-    else: # for doxygen 1.7.4
+-        header = text[:re.search(r'<div class="title">[^<]*</div>\s*</div>\s*</div>\n<div class="contents">',text).end()]
++    else: # for doxygen 1.7.4 to 1.7.6.1
++        header = text[:re.search(r'<div class="title">[^<]*</div>\s*</div>\s*</div>(?:<!--header-->)?\n<div class="contents">',text).end()]
+     footer = re.search(r'(?s)(<!-- footer.html -->.*)', text).group(1)
+ 
+     text = re.sub(r'Namespace List', r'Function Index', header)
+diff --git a/docsrc/post.py b/docsrc/post.py
+index a8836d5..fc51f8d 100644
+--- a/docsrc/post.py
++++ b/docsrc/post.py
+@@ -51,13 +51,13 @@
+ </div>
+ <div class="contents">''')
+ 
+-# tested with doxygen 1.7.5.1
++# tested with doxygen 1.7.5.1 and 1.7.6.1
+ mainHeading4 = re.compile(r'''(<!-- Generated by Doxygen .+ -->
+ </div>)
+ (<div class="header">
+   <div class="headertitle">
+ )<div class="title">(.*)</div>  </div>(.*)()
+-</div>
++</div>(?:<!--header-->)?
+ <div class="contents">''')
+ 
+ mainHeadingReplacement = '''\\1
+@@ -149,7 +149,7 @@ def processFile(fileName):
+     f.close()
+ 
+ files = glob.glob(path + '/*.html')  # use given path to files
+-#files = glob.glob('../doc/vigra/index.html')
++#files = glob.glob(path + '/index.html')
+ 
+ for file in files:
+    processFile(file)
+-- 
+1.8.1.6
+
diff --git a/media-libs/vigra/files/vigra-1.8.0-gcc47.patch b/media-libs/vigra/files/vigra-1.8.0-gcc47.patch
new file mode 100644
index 000000000000..83d5f7ee5c59
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-gcc47.patch
@@ -0,0 +1,25 @@
+From 11113f8f5ffa868e32259e8d6dcdb543fd58848b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Mon, 11 Jun 2012 08:33:06 +0200
+Subject: [PATCH] Fix building with gcc-4.7
+
+---
+ include/vigra/numpy_array.hxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/vigra/numpy_array.hxx b/include/vigra/numpy_array.hxx
+index 1d06a79..7806f6b 100644
+--- a/include/vigra/numpy_array.hxx
++++ b/include/vigra/numpy_array.hxx
+@@ -1074,7 +1074,7 @@ void NumpyArray<N, T, Stride>::setupArrayView()
+ 
+         this->m_stride /= sizeof(value_type);
+         this->m_ptr = reinterpret_cast<pointer>(pyArray()->data);
+-        vigra_precondition(checkInnerStride(Stride()),
++        vigra_precondition(this->checkInnerStride(Stride()),
+             "NumpyArray<..., UnstridedArrayTag>::setupArrayView(): First dimension of given array is not unstrided (should never happen).");
+ 
+     }
+-- 
+1.7.8.6
+
diff --git a/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch b/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch
new file mode 100644
index 000000000000..f4bb98ac62c6
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch
@@ -0,0 +1,28 @@
+diff --git a/vigranumpy/docsrc/CMakeLists.txt b/vigranumpy/docsrc/CMakeLists.txt
+index 547cf81..d12a6f7 100644
+--- a/vigranumpy/docsrc/CMakeLists.txt
++++ b/vigranumpy/docsrc/CMakeLists.txt
+@@ -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.")
+@@ -49,7 +49,7 @@ IF(PYTHON_SPHINX)
+             ${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
+@@ -57,7 +57,7 @@ ELSE(PYTHON_SPHINX)
+         "(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/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
new file mode 100644
index 000000000000..e6deb761d1c5
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
@@ -0,0 +1,74 @@
+diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt
+--- vigra-1.9.0.old/CMakeLists.txt	2013-06-04 13:38:43.158564579 +0200
++++ vigra-1.9.0/CMakeLists.txt	2013-06-04 13:45:19.290550486 +0200
+@@ -57,13 +57,27 @@
+ #     search for dependencies
+ #
+ ##################################################
++OPTION(WITH_TIFF "Enable tiff support" ON)
++OPTION(WITH_JPEG "Enable jpeg support" ON)
++OPTION(WITH_PNG "Enable png support" ON)
++OPTION(WITH_OPENEXR "Enable openexr support" ON)
++OPTION(WITH_FFTW3 "Enable fftw support" ON)
++OPTION(ENABLE_DOC "Build documentation" ON)
+ 
+ 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 libfftw-3.3)
+-VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
++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 libfftw-3.3)
++    VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
++ENDIF()
+ IF(WITH_OPENEXR)
+     VIGRA_FIND_PACKAGE(OpenEXR)
+ ENDIF()
+@@ -72,8 +86,10 @@
+ ENDIF()
+ 
+ SET(DOXYGEN_SKIP_DOT TRUE)
++IF(ENABLE_DOC)
+ FIND_PACKAGE(Doxygen)
+ FIND_PACKAGE(PythonInterp)
++ENDIF()
+ 
+ IF(WITH_VIGRANUMPY)
+     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
+diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt
+--- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:38:43.207564577 +0200
++++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:45:51.962549323 +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.")
+@@ -49,7 +49,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
+@@ -57,7 +57,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/metadata.xml b/media-libs/vigra/metadata.xml
new file mode 100644
index 000000000000..e450ba260ec9
--- /dev/null
+++ b/media-libs/vigra/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>printing</herd>
+</pkgmetadata>
diff --git a/media-libs/vigra/vigra-1.10.0.ebuild b/media-libs/vigra/vigra-1.10.0.ebuild
new file mode 100644
index 000000000000..1f84ed48fd24
--- /dev/null
+++ b/media-libs/vigra/vigra-1.10.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MY_P=${P}-src-with-docu
+MY_V=${PV//\./-}
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+inherit cmake-utils python-r1
+
+DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
+HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${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 mpi openexr +png +python test +tiff"
+
+# runtime dependency on python:2.7 is required by the vigra-config script
+RDEPEND="
+	dev-lang/python:2.7
+	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
+	fftw? ( sci-libs/fftw:3.0 )
+	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] )
+	jpeg? ( virtual/jpeg )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	tiff? ( media-libs/tiff:0= )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+	)
+	test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	doc? ( hdf5 fftw )
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-automagicness.patch"
+	"${FILESDIR}/${P}-cmake-scripts.patch"
+	"${FILESDIR}/${P}-mpi-fixes.patch"
+)
+DOCS=( README.md )
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	einfo "Removing shipped doc, Win32 dependencies and VCS files"
+	rm -rf doc
+	rm vigra-dependencies-win32-vs8.zip
+	rm .git* .hg* .travis.yml
+
+	cmake-utils_src_prepare
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+	vigra_configure() {
+		local libdir="$(get_libdir)"
+
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCDIR="${BUILD_DIR}/doc"
+			-DDOCINSTALL="share/doc/${P}"
+			-DLIBDIR_SUFFIX="${libdir/lib}"
+			-DWITH_VALGRIND=OFF
+			$(cmake-utils_use_enable doc DOC)
+			$(cmake-utils_use_with fftw FFTW3)
+			$(cmake-utils_use_with hdf5 HDF5)
+			$(cmake-utils_use_with jpeg JPEG)
+			$(cmake-utils_use_with mpi MPI)
+			$(cmake-utils_use_with png PNG)
+			$(cmake-utils_use_with openexr OPENEXR)
+			$(cmake-utils_use_with python VIGRANUMPY)
+			$(cmake-utils_use_with tiff TIFF)
+			$(cmake-utils_use_build test TESTING)
+			$(cmake-utils_use test CREATE_CTEST_TARGETS)
+			$(cmake-utils_use test AUTOBUILD_TESTS)
+		)
+		cmake-utils_src_configure
+	}
+
+	if use python; then
+		python_foreach_impl vigra_configure
+	else
+		# required for docdir
+		_check_build_dir init
+		vigra_configure
+	fi
+}
+
+src_compile() {
+	local VIGRA_BUILD_DIR
+	vigra_compile() {
+		cmake-utils_src_compile
+		VIGRA_BUILD_DIR="${BUILD_DIR}"
+	}
+	if use python; then
+		python_foreach_impl vigra_compile
+	else
+		vigra_compile
+	fi
+
+	if use doc; then
+		einfo "Generating Documentation"
+		# use build dir from last compile command
+		BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl cmake-utils_src_install
+		python_optimize
+	else
+		cmake-utils_src_install
+	fi
+}
+
+src_test() {
+	# perhaps disable tests (see #390447)
+	vigra_test() {
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+	}
+	if use python; then
+		python_foreach_impl vigra_test
+	else
+		vigra_test
+	fi
+}
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
new file mode 100644
index 000000000000..dda3d6a76536
--- /dev/null
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+
+# This ebuild could use python-r1 in the future when upstream gets Python 3.x
+# support working
+inherit cmake-utils eutils multilib python-single-r1
+
+MY_P=${P}-src
+
+DESCRIPTION="a C++ computer vision library with emphasis on customizability of algorithms and data structures"
+HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/"
+SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${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 openexr +png +python test +tiff"
+
+# Pull in dev-lang/python:2.7 for vigra-config which is always installed
+RDEPEND="dev-lang/python:2.7
+	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
+	fftw? ( sci-libs/fftw:3.0 )
+	hdf5? ( sci-libs/hdf5:= )
+	jpeg? ( virtual/jpeg )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+	)
+	test? (
+		python? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
+	)"
+REQUIRED_USE="doc? ( hdf5 fftw )
+	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+	test? ( hdf5 python fftw )"
+
+DOCS=( README.txt )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagicness.patch
+
+	# Don't build nor install API docs when not requested
+	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
+
+	# Don't use python_fix_shebang because we can't put this behind USE="python"
+	sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+
+	# required for ddocdir
+	_check_build_dir init
+	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 openexr)
+		$(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_test() { :; } #390447
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}