commit: 6200a622d868d134deaa27d0de9a6e5b20e007c7 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Wed Jun 6 22:04:25 2018 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Wed Jun 6 22:04:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6200a622
media-libs/vigra: Remove old Bug: https://bugs.gentoo.org/618172 Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-libs/vigra/Manifest | 1 - .../vigra/files/vigra-1.9.0-automagicness.patch | 74 ---------------- media-libs/vigra/vigra-1.9.0.ebuild | 98 ---------------------- 3 files changed, 173 deletions(-) diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index b13f0e00d5b..6ba1371af9f 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,3 +1,2 @@ DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 -DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 diff --git a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch deleted file mode 100644 index e6deb761d1c..00000000000 --- a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch +++ /dev/null @@ -1,74 +0,0 @@ -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/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild deleted file mode 100644 index 0252dcd97b6..00000000000 --- a/media-libs/vigra/vigra-1.9.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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 -}
