[gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/files/, media-libs/vigra/

[Andreas Hüttel]

commit:     24636b0d040ab64a4e7b1eefb761bc52d62c32b8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 22:02:43 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 22:03:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24636b0d

media-libs/vigra: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/vigra/Manifest                          |   1 -
 .../vigra/files/vigra-1.10.0-automagicness.patch   |  64 ------
 .../vigra/files/vigra-1.10.0-cmake-scripts.patch   |  53 -----
 .../vigra/files/vigra-1.10.0-mpi-fixes.patch       | 230 ---------------------
 media-libs/vigra/vigra-1.10.0.ebuild               | 141 -------------
 5 files changed, 489 deletions(-)

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 76b42e3384..e4a5835ce7 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,3 +1,2 @@
-DIST vigra-1.10.0-src-with-docu.tar.gz 36122311 SHA256 42d4a361b0bb52fbfdae7e76000698be04dabba77be3f4248d369139fe96a099 SHA512 4c0edb9d5a05d341034b6fe504658525130ddf830b09af4e08d9080407dd10ec62355bed362c4876cb1504632202a5eb125dc50cb66b0617c28dd274b8367d4d WHIRLPOOL 92cf1517acc6ff11eb255cb6bee523ebcaab118b9f73602baf07be8070c537c5bb7e94a9ccbd97bd7e20e20efeb8ac485a184f1c3609fe7747051ed6ec4ca65f
 DIST vigra-1.11.0-src.tar.gz 51854568 SHA256 68617de347eae7d4700a8f66cd59ce31d6cd92ffb4a235b4df34c688673af5cb SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a WHIRLPOOL 1dc73a42b5033c88427850d72078475211a206d9af69209a5d3d05d1b117baef651ccb8232b0c0428b775160feda28b08aae3f14ab07c353de1b076664a0e105
 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
deleted file mode 100644
index 182f40e2c8..0000000000
--- a/media-libs/vigra/files/vigra-1.10.0-automagicness.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index dc3a72e43e..0000000000
--- a/media-libs/vigra/files/vigra-1.10.0-cmake-scripts.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Fix location of installed cmake scripts
-Author: Jens-Malte Gottfried <jmgottfried@×××.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
deleted file mode 100644
index 83bb86d111..0000000000
--- a/media-libs/vigra/files/vigra-1.10.0-mpi-fixes.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Description: Fix build with mpi enabled hdf5 libraries
-Author: Jens-Malte Gottfried <jmgottfried@×××.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/vigra-1.10.0.ebuild b/media-libs/vigra/vigra-1.10.0.ebuild
deleted file mode 100644
index f36dc518bf..0000000000
--- a/media-libs/vigra/vigra-1.10.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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="https://ukoethe.github.io/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
-		_cmake_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
-}