From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- media-libs/vigra/Manifest | 3 +- media-libs/vigra/vigra-1.11.1-r2.ebuild | 169 -------------------------------- media-libs/vigra/vigra-1.11.1-r3.ebuild | 4 +- 3 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 media-libs/vigra/vigra-1.11.1-r2.ebuild (limited to 'media-libs/vigra') diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index d9b23bf7f1e8..04cf2bde27d7 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -5,7 +5,6 @@ AUX vigra-1.11.1-lib_suffix.patch 1032 BLAKE2B ce1b73b89c4d10c3b2ef3185a3c9a7ca7 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 -EBUILD vigra-1.11.1-r2.ebuild 3819 BLAKE2B 583c605773456bc4cc866548bb8ac584a72e8d3619d829446b824b2ca426e1a260e0bf05911b53ac5816e91a55a812e49080c9a464b4540b0433122b78d4b9db SHA512 f8bce7ed99e4c1662b2242c0a251e8654260ff92ea52a0d67bdf8e8456bc4f07225bd92667a888fc2cb6c4ede387f07a51084c8d2e9b7d46453dabd519acc456 -EBUILD vigra-1.11.1-r3.ebuild 3553 BLAKE2B 96598be9b6e1ab1d2b883e769e1dc6e30d426ec5b90fc91209d30bf68925c59b69c461c627c4faa843860ca10349bd8d5b3ac0cee383178c6d584464595bef1c SHA512 6ca93606b50d6bbde4712192ab86260d5c8c5014b39a02984b17000d4906b5ca4fa552bb68b7253b617a99cb05c5351e1d482af6e7081d9126e4a8662a4f6160 +EBUILD vigra-1.11.1-r3.ebuild 3550 BLAKE2B adfeb786c9b5d64448fa4f63e0c51c295b65d40ed92cde73c8924f4e9777d450f7c2c25709c7479dfa8841c5c6282fa47e6a6f85a207ff01bcfe42680e78ed24 SHA512 eccd61434bcd23f22edad9458c4389f091efd6fb2892d6de044cec0668968d70618f6c4ed4940d185bc7e8117ec5e7ed92d99ccf95f0b79bf1790b9e35d3d23e EBUILD vigra-9999.ebuild 3905 BLAKE2B 5df7ecdb49b73ebd5885fe959265306ae4c7cd3eca7c9002c373dba19dbd84bf483b13fcb9eb41e4f367f75492d26686d6d15faf18602bffe16f23a18ea62b58 SHA512 715d241d3fe38f88010c2604321dd7a77d920c1df9ff795ad0b6fca82b445c279a4585398fbe6913235ff18b9506bd7b8a868f02dc66a39102546cdbeb8942d2 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71 diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild deleted file mode 100644 index 757fe839d198..000000000000 --- a/media-libs/vigra/vigra-1.11.1-r2.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${P}-src" -MY_V="${PV//\./-}" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads,xml" -inherit cmake-utils python-r1 - -DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" -HOMEPAGE="https://ukoethe.github.io/vigra/" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${MY_V}/${MY_P}.tar.gz" - KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind +zlib" - -REQUIRED_USE=" - doc? ( hdf5 fftw ${PYTHON_REQUIRED_USE} ) - python? ( hdf5 ${PYTHON_REQUIRED_USE} ) - test? ( hdf5 python fftw )" - -BDEPEND=" - doc? ( - app-doc/doxygen - >=dev-python/sphinx-1.1.3-r5 - ) - test? ( - >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] - valgrind? ( dev-util/valgrind ) - ) -" -# runtime dependency on python:2.7 is required by the vigra-config script -DEPEND=" - dev-lang/python:2.7 - fftw? ( sci-libs/fftw:3.0 ) - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - png? ( media-libs/libpng:0= ) - python? ( - dev-libs/boost:=[python?,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) - tiff? ( media-libs/tiff:0= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND="${DEPEND}" - -# Severely broken, also disabled in Fedora, bugs #390447, #653442 -RESTRICT="test" - -PATCHES=( - # git master - "${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch" - "${FILESDIR}/${P}-boost-python.patch" - # TODO: upstream - "${FILESDIR}/${P}-lib_suffix.patch" - "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 -) - -pkg_setup() { - if use python || use doc; then - python_setup - fi -} - -src_prepare() { - vigra_disable() { - if ! use ${1}; then - sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \ - -i CMakeLists.txt || die "failed to disable ${1}" - fi - } - - cmake-utils_src_prepare - - if [[ ${PV} != *9999 ]]; then - rm -r doc || die "failed to remove shipped docs" - fi - - vigra_disable fftw fftw3 - vigra_disable fftw fftw3f - vigra_disable jpeg - vigra_disable png - vigra_disable tiff - vigra_disable zlib - - # 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 - - use test || cmake_comment_add_subdirectory test -} - -src_configure() { - vigra_configure() { - local mycmakeargs=( - -DAUTOEXEC_TESTS=OFF - -DDOCDIR="${BUILD_DIR}/doc" - -DDOCINSTALL="share/doc/${PF}" - -DWITH_HDF5=$(usex hdf5) - -DWITH_OPENEXR=$(usex openexr) - -DWITH_VALGRIND=$(usex valgrind) - -DWITH_VIGRANUMPY=$(usex python) - ) - 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 - VARTEXFONTS="${T}/fonts" 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.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild index d38b643763a9..bfb94af9b87d 100644 --- a/media-libs/vigra/vigra-1.11.1-r3.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz" - KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" -- cgit v1.2.3