From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3B7A158094 for ; Wed, 17 Aug 2022 16:21:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B1A8E08F7; Wed, 17 Aug 2022 16:21:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08692E08F6 for ; Wed, 17 Aug 2022 16:21:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2692734135A for ; Wed, 17 Aug 2022 16:21:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83D3B580 for ; Wed, 17 Aug 2022 16:21:23 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1660753265.3f7cebf28a502d5407acc6dd4aaf8d130f74c255.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/vigra-1.11.1-r3.ebuild media-libs/vigra/vigra-1.11.1-r4.ebuild X-VCS-Directories: media-libs/vigra/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3f7cebf28a502d5407acc6dd4aaf8d130f74c255 X-VCS-Branch: master Date: Wed, 17 Aug 2022 16:21:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dff4695f-e61e-4988-b9c4-38f911c440d0 X-Archives-Hash: 1eb052ef8fc9e37dc4a6e6dd298060c6 commit: 3f7cebf28a502d5407acc6dd4aaf8d130f74c255 Author: Matt Turner gentoo org> AuthorDate: Wed Aug 17 13:44:51 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Aug 17 16:21:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7cebf2 media-libs/vigra: Drop old versions Signed-off-by: Matt Turner gentoo.org> media-libs/vigra/vigra-1.11.1-r3.ebuild | 160 -------------------------------- media-libs/vigra/vigra-1.11.1-r4.ebuild | 160 -------------------------------- 2 files changed, 320 deletions(-) diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild deleted file mode 100644 index 65fd07b618ac..000000000000 --- a/media-libs/vigra/vigra-1.11.1-r3.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="threads(+),xml" -inherit cmake flag-o-matic 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-${PV//\./-}/${P}-src.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=" - python? ( hdf5 ${PYTHON_REQUIRED_USE} ) - test? ( hdf5 python fftw )" - -BDEPEND=" - test? ( - >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] - valgrind? ( dev-util/valgrind ) - ) -" -# runtime dependency on python is required by the vigra-config script -DEPEND=" - fftw? ( sci-libs/fftw:3.0 ) - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - png? ( media-libs/libpng:0= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python?,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) - tiff? ( media-libs/tiff:0= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND="${PYTHON_DEPS} - ${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" - "${FILESDIR}/${P}-python3.7.patch" # bug 701208 - "${FILESDIR}/${P}-gcc-10.patch" # bug 723302 - # TODO: upstream - "${FILESDIR}/${P}-lib_suffix.patch" - "${FILESDIR}/${P}-cmake-module-dir.patch" - "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 -) - -pkg_setup() { - use python && python_setup -} - -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_src_prepare - - 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:python3:' config/vigra-config.in || die - - use doc || cmake_comment_add_subdirectory docsrc - - if ! use test; then - cmake_comment_add_subdirectory test - cmake_run_in vigranumpy cmake_comment_add_subdirectory test - fi -} - -src_configure() { - # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) - # bug #808731 - use hdf5 && append-cppflags -DH5_USE_110_API - - vigra_configure() { - local mycmakeargs=( - -DAUTOEXEC_TESTS=OFF - -DDOCINSTALL="share/doc/${PF}/html" - -DWITH_HDF5=$(usex hdf5) - -DWITH_OPENEXR=$(usex openexr) - -DWITH_VALGRIND=$(usex valgrind) - -DWITH_VIGRANUMPY=$(usex python) - ) - cmake_src_configure - } - - if use python; then - python_foreach_impl vigra_configure - else - vigra_configure - fi -} - -src_compile() { - local VIGRA_BUILD_DIR - vigra_compile() { - cmake_src_compile - VIGRA_BUILD_DIR="${BUILD_DIR}" - } - if use python; then - python_foreach_impl vigra_compile - else - vigra_compile - fi -} - -src_install() { - if use python; then - python_foreach_impl cmake_src_install - python_optimize - else - cmake_src_install - fi -} - -src_test() { - # perhaps disable tests (see #390447) - vigra_test() { - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_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-r4.ebuild b/media-libs/vigra/vigra-1.11.1-r4.ebuild deleted file mode 100644 index be3e2f9fe820..000000000000 --- a/media-libs/vigra/vigra-1.11.1-r4.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -PYTHON_REQ_USE="threads(+),xml" -inherit cmake flag-o-matic 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-${PV//\./-}/${P}-src.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=" - python? ( hdf5 ${PYTHON_REQUIRED_USE} ) - test? ( hdf5 python fftw )" - -BDEPEND=" - test? ( - >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] - valgrind? ( dev-util/valgrind ) - ) -" -# runtime dependency on python is required by the vigra-config script -DEPEND=" - fftw? ( sci-libs/fftw:3.0= ) - hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - png? ( media-libs/libpng:0= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python?,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ) - tiff? ( media-libs/tiff:0= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND="${PYTHON_DEPS} - ${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" - "${FILESDIR}/${P}-python3.7.patch" # bug 701208 - "${FILESDIR}/${P}-gcc-10.patch" # bug 723302 - # TODO: upstream - "${FILESDIR}/${P}-lib_suffix.patch" - "${FILESDIR}/${P}-cmake-module-dir.patch" - "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 -) - -pkg_setup() { - use python && python_setup -} - -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_src_prepare - - 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:python3:' config/vigra-config.in || die - - use doc || cmake_comment_add_subdirectory docsrc - - if ! use test; then - cmake_comment_add_subdirectory test - cmake_run_in vigranumpy cmake_comment_add_subdirectory test - fi -} - -src_configure() { - # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) - # bug #808731 - use hdf5 && append-cppflags -DH5_USE_110_API - - vigra_configure() { - local mycmakeargs=( - -DAUTOEXEC_TESTS=OFF - -DDOCINSTALL="share/doc/${PF}/html" - -DWITH_HDF5=$(usex hdf5) - -DWITH_OPENEXR=$(usex openexr) - -DWITH_VALGRIND=$(usex valgrind) - -DWITH_VIGRANUMPY=$(usex python) - ) - cmake_src_configure - } - - if use python; then - python_foreach_impl vigra_configure - else - vigra_configure - fi -} - -src_compile() { - local VIGRA_BUILD_DIR - vigra_compile() { - cmake_src_compile - VIGRA_BUILD_DIR="${BUILD_DIR}" - } - if use python; then - python_foreach_impl vigra_compile - else - vigra_compile - fi -} - -src_install() { - if use python; then - python_foreach_impl cmake_src_install - python_optimize - else - cmake_src_install - fi -} - -src_test() { - # perhaps disable tests (see #390447) - vigra_test() { - PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test - } - if use python; then - python_foreach_impl vigra_test - else - vigra_test - fi -}