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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C412138335 for ; Mon, 8 Apr 2019 21:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94624E09A2; Mon, 8 Apr 2019 21:15:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54A48E09A2 for ; Mon, 8 Apr 2019 21:15:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79ABF335D1B for ; Mon, 8 Apr 2019 21:15:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E91355A0 for ; Mon, 8 Apr 2019 21:15:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1554757846.fbec2d140834b04eee6c2a306993d1ec65f820da.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/vigra-9999.ebuild X-VCS-Directories: media-libs/vigra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fbec2d140834b04eee6c2a306993d1ec65f820da X-VCS-Branch: master Date: Mon, 8 Apr 2019 21:15:09 +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: e5d4d82b-a5fb-4063-98fd-289554d9a551 X-Archives-Hash: c346463e0bc433b5e82c23e6d319a0aa commit: fbec2d140834b04eee6c2a306993d1ec65f820da Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 8 18:39:00 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 8 21:10:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbec2d14 media-libs/vigra: EAPI-7 bump Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/vigra/vigra-9999.ebuild | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 4073587b713..120f0cc2429 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +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" @@ -24,8 +24,20 @@ LICENSE="MIT" SLOT="0" IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" +REQUIRED_USE=" + doc? ( hdf5 fftw ) + python? ( hdf5 ${PYTHON_REQUIRED_USE} ) + test? ( hdf5 python fftw )" + +BDEPEND=" + doc? ( + app-doc/doxygen + python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) + ) + test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] ) +" # runtime dependency on python:2.7 is required by the vigra-config script -RDEPEND=" +DEPEND=" dev-lang/python:2.7 >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] fftw? ( sci-libs/fftw:3.0 ) @@ -35,35 +47,24 @@ RDEPEND=" png? ( media-libs/libpng:0= ) python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) tiff? ( media-libs/tiff:0= ) - valgrind? ( dev-util/valgrind )" - -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 )" + valgrind? ( dev-util/valgrind ) +" +RDEPEND="${DEPEND}" # Severely broken, also disabled in Fedora, bugs #390447, #653442 RESTRICT="test" -DOCS=( README.md ) - pkg_setup() { use python && python_setup } src_prepare() { - einfo "Removing shipped docs and VCS files" - rm -rf doc || die - cmake-utils_src_prepare + if [[ ${PV} != *9999 ]]; then + rm -r doc || die "failed to remove shipped docs" + fi + # 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 }