+++ /dev/null
-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)
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="https://ukoethe.github.io/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~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
- _cmake_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
-}
projects / gentoo.git / commitdiff